Merge changes I8f4166ff,I51f1c1ab into main am: 75410032e0

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

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