Merge changes I87868e87,I191fabee,Ib7d1491e am: eea1a68f03

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

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