Merge "Revert^2 "Enable deleteAllKeys from vold"" into sc-dev am: 548474ce34

Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/15547743

Change-Id: If90c5489d72720cb98eb8c5e3c07d44de86805e5