Merge changes I7d25f88d,Ie71a8f57 into main am: fe7c4aef9a

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

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