Merge changes I1f98c2ce,Id047977a am: e72729e18a am: 4cc6d3c7a5

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

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