Merge changes I2145a7ed,Iacd188cb,Ib672b23b am: 8770dbcfa3

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

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