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

[automerger skipped] Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" into sc-dev am: 8199b2b1 am: 7bf46f89 -s ours am: 41e0160d -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: I8458b30d21942d46ea4d6264995db2a3885eeb19