Merge changes I8557b04c,I31610911 into main am: c8e471f5d2 am: afe7622a94 am: 34e44d0b34

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

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