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

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

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