Merge changes I232ec389,I6c9ca2f2,I0dcd1f3a am: dfdc5ce529 am: 46cf5af840

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

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