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: Ie0847281b708c9eb06d54a7078fd6476e65a4099