Merge changes I5c955cba,Ie522f556 into main am: d1475079d3 am: d299e6f827

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

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