Merge changes I4e779ab0,I9105f200 am: 3cb844337f am: 27adb66071 am: 36e370d1fb

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

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