Merge changes I2145a7ed,Iacd188cb,Ib672b23b am: 8770dbcfa3 am: 08a06018ff

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

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