Merge "Do not delete all keys after creating a first crypt device" am: 9e3f17a57e am: 8e90f934f7 am: 70021209ae

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

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