Merge changes Ifadaa709,I480d8411,Ieb8a961e into main am: 6c76d1045d

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

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