Merge changes I153ccc20,I5e02dc07 into main am: 477734406d am: 00976ee337

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

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