[automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 am: eb384a27f3 -s ours

am skip reason: skipped by user paulcrowley

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

Change-Id: Ia1aae152f2377dfd0cd0a874fa944ed9ed0f0b4b