Merge changes Icea5d27b,Ie6e0d01c am: bf6eeaa0ae

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

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