Merge changes Ia0d74953,I22651063 am: 93c5033614

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

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