Merge changes I8007849d,Ia8d589f5 am: cac60c47cf

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

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