Merge changes I4e779ab0,I9105f200 am: 3cb844337f

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

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