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

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

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