Merge changes from topic "fsverity-after-compos" am: f74674e960 am: 9c9dc6897e

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

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