Merge changes I3294e35f,I2b3572d5 into main am: d62453898d

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

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