Merge changes I1f98c2ce,Id047977a am: e72729e18a

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

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