Merge changes Ic5efebce,I597a6ba5,I4575b41e,I714a95d9,I7d2d8ecb, ... into main am: 9e34e6abcf

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

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