Merge "Microdroid: Map a dm-crypt dev on (virtio-blk)disk" am: 4378108886 am: 1dcb8017bb am: 39dd2fbbca

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2302502

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