Merge changes I2866f412,Ia99044e8 am: 6cecfa4540

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

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