Merge changes from topic "block-apex-dmverity-mount" am: 18b60d32b3 am: f5c314d717

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

Change-Id: I3316d50158c4538ed3c0ccb1c59d47bf77b17870