Android Mainline 12.0.0 Release 100 (8305796,com.google.android.networkstack)
Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00

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

Change-Id: Ie8a80dd58abc9d8d31448130b54b6d6631292dc1