Merge changes I5d8e169d,I832b705d,Ic8af83b8,Ib3c9acb8,I2e357326, ... into main am: f20b95675a am: 2364a4a666

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

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