Merge changes I53101f6d,I53bb3fcf into main am: 8c67307c49

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

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