Revert^2 "Enable deleteAllKeys from vold"

Revert of cac9588d7ee8d3e5bfa684cd0bb92db80ac3bac4
aka I0a236e0308b9b8354e669b9261fc22a88a01f743
re-landing change Ife779307db0fe161c8889f7aaab34e2899a6c9e6

Bug: 187105270
Change-Id: I2981420841f2ecdc67a36f9a8c7b81bad00bfe96
1 file changed