Merge changes I44bc5281,Iea377f4e into main am: a5fd810fd4

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

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