Merge changes I8f4166ff,I51f1c1ab into main am: 75410032e0 am: 75ec39d6b0

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

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