Merge changes I87868e87,I191fabee,Ib7d1491e am: eea1a68f03 am: 7496f2c506 am: 3badbb0b67

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

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