Merge changes Iaa2b21f4,I51d8c91d into main am: 4e66e3ddc9

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

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