Merge changes I801ff6fd,I3a008c4b into main am: 004e8def08

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

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