Merge changes I682868d1,Ib5ba16b4 into main am: f96605a14c

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

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