[automerger skipped] Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" into sc-dev am: 8199b2b1d3 am: 7bf46f89dd -s ours
am skip reason: Merged-In Ib60c68e3e91a4f0a7fd4e86b462091995bbe4fe2 with SHA-1 6be69d8f3b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640276
Change-Id: I09c1fc75a2189b4010cc92daf35b3f85bfc7c205
This commit is contained in: