Merge changes Iaa09cb74,I59376805 into main am: c8a739b40b

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

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