tree dd87fe0d4d624947a5e7af48fe09a2b979611fd6
parent 7d81779ba32195363bff0f4499f997cf7d455516
parent fb0d651988531c24a538276beb1f94453bb24ab9
author Shawn Willden <swillden@google.com> 1628733423 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628733423 +0000

Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee am: fb0d651988

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

Change-Id: Ib8b347507793c00f6f2c585c7cadf4bdbdb0961c