Merge "Support zoned device with dm-default-key" am: bb97be3d am: 43c03c3f

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



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