tree 3cbba5eb819d85429dfed3bc0d6f3440840531e1
parent 96b31a40b7bf04553a18f4932ae089e2a05a654b
parent 2160b23d148997136e8e160b7af2217c4d2d7c41
author Paul Crowley <paulcrowley@google.com> 1628720161 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628720161 +0000

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

am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 1e6a5f5106 is already in history

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

Change-Id: Id349576b4c4bdb2c98961d45f24c21cdfac812f8