Merge changes I93b907b7,Ie3bc2b88 into main am: 27ccc62f76 am: 16dfdff6ef

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

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