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

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

Change-Id: Ic83dd67c537d6c0aeedf42f2ff9d711b274a7047