Merge changes Iee55d611,I98e0173f,I4ed5bff2 into main am: 61066b0c54

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

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