Merge changes I3cfa3974,Ibfa26306 into main am: e0deacafbf

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

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