Merge changes I48987602,Idcc3c7e8,I9dda103f into main am: bd05f76b6d

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

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