Merge changes Ia242c505,I5f641294 into main am: 7f4c0ac956

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

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