Merge changes from topic "b/302677468" into main am: e6a6518eb2 am: b3bfc47e53

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

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