Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee

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

Change-Id: I9f904f8c3206a63305ab4d8796b301b8687125f3