[OTA-R] Correct the implementation of mProviderRetryCount (#18908)

* Implemented fix for Issue #18824.

* - Remove debug code.
- scripts/helpers/restyle-diff.sh

* Code review changes.

* Code review changes.

- Remove reset from DefaultOTARequestorDriver::UpdateDownloaded()

examples/ota-requestor-app/linux/main.cpp

@@ -126,11 +126,15 @@ void CustomOTARequestorDriver::UpdateDownloaded()
 {
     if (gAutoApplyImage)
     {
-        // Let the default driver take further action to apply the image
+        // Let the default driver take further action to apply the image.
+        // All member variables will be implicitly reset upon loading into the new image.
         DefaultOTARequestorDriver::UpdateDownloaded();
     }
     else
     {
+        // Download complete but we're not going to apply image, so reset provider retry counter.
+        mProviderRetryCount = 0;
+
         // Reset to put the state back to idle to allow the next OTA update to occur
         gRequestorCore.Reset();
     }

src/app/clusters/ota-requestor/DefaultOTARequestor.cpp

@@ -621,7 +621,6 @@ void DefaultOTARequestor::OnDownloadStateChanged(OTADownloader::State state, OTA
         {
             RecordErrorUpdateState(CHIP_ERROR_CONNECTION_ABORTED, reason);
         }
-
         break;
     default:
         break;