Merge changes I4584b250,Ie3742084 into main am: efc3d35f5c

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

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