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

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



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