Merge changes from topics "b/308759880", "b/313042092" into main am: d8ecced1c4

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

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