Merge "Detect factory reset and deleteAllKeys" am: 407b2c2386

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

Change-Id: Ibc05df1c5ceede35fdca6d1e6a5abd67e70519f5