Merge "Crash during OTA merge may lead to blocks with stale data" am:...

Merge "Crash during OTA merge may lead to blocks with stale data" am: 39b47504 am: cc4d37ba am: 5c7056f5 am: 653bbfd0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1780351

Change-Id: I6a43a6b836117a178d3533fe98e2aa999d753e8c