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

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

Change-Id: I0302ea37e1be725ebd3efa558d4d31af58157e73