Snap for 8912782 from c64ba1ee743893065d2c30799b06216e9565c3b7 to tm-qpr1-release

Change-Id: I36040049ddc95bb03681daadc7c6c38ae72b998c
diff --git a/aosp/update_attempter_android.cc b/aosp/update_attempter_android.cc
index a3485ea..1d35b5e 100644
--- a/aosp/update_attempter_android.cc
+++ b/aosp/update_attempter_android.cc
@@ -263,6 +263,7 @@
   install_plan_.is_resume = !payload_id.empty() &&
                             DeltaPerformer::CanResumeUpdate(prefs_, payload_id);
   if (!install_plan_.is_resume) {
+    boot_control_->GetDynamicPartitionControl()->Cleanup();
     // No need to reset dynamic_partititon_metadata_updated. If previous calls
     // to AllocateSpaceForPayload uses the same payload_id, reuse preallocated
     // space. Otherwise, DeltaPerformer re-allocates space when the payload is