[automerger skipped] Crash during OTA merge may lead to blocks with stale data...

[automerger skipped] Crash during OTA merge may lead to blocks with stale data am: 533c2f6d am: c2460a7c -s ours

am skip reason: Merged-In Id895fe7a3d6b4510676490a86d0caf62dec9b079 with SHA-1 f7241761 is already in history

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

Change-Id: I57e552d333be6362cb0d75d8e6430c764bc841d5