Merge "Detect factory reset and deleteAllKeys" am: 407b2c2386 am: 85961f7a9c am: c248576dad

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

Change-Id: I85671247354c4bbfb5b8d35cac3780331ac0bcf1