[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: 3f682b63 -s ours am: ed6a6427 -s ours

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

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

Change-Id: I84aa6bdc5973e7c23e913d7de8c7366b66cfce7d