Merge changes from topic "b/300911665" into main am: 0cec98ed59

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

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