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

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



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