[nxp][platform][ota] Add runtime ota reboot delay / Add OTA_ServiceDeInit in AbortAction

Signed-off-by: Andrei Menzopol <andrei.menzopol@nxp.com>

Author: andrei-menzopol

src/platform/nxp/common/ota/OTAFirmwareProcessor.cpp

@@ -107,6 +107,8 @@ CHIP_ERROR OTAFirmwareProcessor::ApplyAction()
 CHIP_ERROR OTAFirmwareProcessor::AbortAction()
 {
     OTA_CancelImage();
+    OTA_ServiceDeInit();
+
     Clear();
 
     return CHIP_NO_ERROR;

src/platform/nxp/common/ota/OTAImageProcessorImpl.cpp

@@ -390,12 +390,14 @@ void OTAImageProcessorImpl::HandleApply(intptr_t context)
 
     ConfigurationManagerImpl().StoreSoftwareUpdateCompleted();
     PlatformMgr().HandleServerShuttingDown();
-
-    // Set the necessary information to inform the SSBL that a new image is available
-    // and trigger the actual device reboot after some time, to take into account
-    // queued actions, e.g. sending events to a subscription
+    /*
+     * Set the necessary information to inform the SSBL/bootloader that a new image
+     * is available and trigger the actual device reboot after some time, to take
+     * into account queued actions, e.g. sending events to a subscription.
+     */
     SystemLayer().StartTimer(
-        chip::System::Clock::Milliseconds32(CHIP_DEVICE_LAYER_OTA_REBOOT_DELAY),
+        chip::System::Clock::Milliseconds32(imageProcessor->mDelayBeforeRebootSec * 1000
+                                            + CHIP_DEVICE_LAYER_OTA_REBOOT_DELAY),
         [](chip::System::Layer *, void *) { OtaHookReset(); }, nullptr);
 }