Merge changes I153ccc20,I5e02dc07 into main am: 477734406d

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

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