Merge changes I232ec389,I6c9ca2f2,I0dcd1f3a am: dfdc5ce529

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

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