Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 am: eae11551bd am: 466e30dffe am: b2b54ff32c

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

Change-Id: I4ccf3e277af5db0813459d1a3759e7b088c5e900