Merge "Do not delete all keys after creating a first crypt device" am: 9e3f17a5 am: 8e90f934

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



Change-Id: I53d48d8cba3fc3ddff5b03729e35026e37e85159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>