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

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

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