Merge changes I1b22a8e3,I06bec55d into main am: ebba900d6d

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

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