Merge changes Ie60a211e,Id9923d05 into main am: 97011cfed3 am: 3b6b95b8a7

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

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