Merge "Mount a filesystem on the crypt block device" am: 34728ffa77 am: 06f772c583

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

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