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

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

Change-Id: I7608e0cccc2c145f722e0fa85b922af9b1d2d8d6