Merge "Clear the warm_reset flag after boot is successful" am: 3fc3d75eb0

am: 9e9e9143b0

Change-Id: Ib1fe4e420b7d673cfbdb4b425ba8b9f97cbea2fc

Checkpoint.cpp

@@ -170,6 +170,10 @@ Status cp_commitChanges() {
         if (!cr.success)
             return error(EINVAL, "Error marking booted successfully: " + std::string(cr.errMsg));
         LOG(INFO) << "Marked slot as booted successfully.";
+        // Clears the warm reset flag for next reboot.
+        if (!SetProperty("ota.warm_reset", "0")) {
+            LOG(WARNING) << "Failed to reset the warm reset flag";
+        }
     }
     // Must take action for list of mounted checkpointed things here
     // To do this, we walk the list of mounted file systems.