tree 96f278a1dbde0d113f12adccfa3e88a797d04b26
parent 426ec8ad34d35c631993f467dc63d6af2b29e7df
parent eae11551bdcd1ee68402a389fce62790ddf840e8
author Paul Crowley <paulcrowley@google.com> 1628823703 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628823703 +0000

Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 am: eae11551bd

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

Change-Id: I5a25f5527538b36dc376bc1a56170411705e7afa