Merge changes I8007849d,Ia8d589f5 am: cac60c47cf am: 8ad42120f0

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

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