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

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

Change-Id: Ia7e08a2167ca587936e23169333baf487714dac2