[automerger skipped] Merge "Corrupt the PersistentDataBlock payload explicitly...

[automerger skipped] Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" into sc-dev am: 8199b2b1 -s ours

am skip reason: Merged-In Ib60c68e3e91a4f0a7fd4e86b462091995bbe4fe2 with SHA-1 6be69d8f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640276

Change-Id: Ifeae6d417e7e7343a084f26ff9ec81455344819a