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

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

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