Merge changes Ie43c82bd,I37197456 into main am: 78da3e7403

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

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