Merge changes I7ec1e151,I12a6a1ef into main am: eb6c5d1c41

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

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