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

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

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