Merge changes from topic "revert-2278163-EHDGJTYSEH" am: 5895ac077f

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

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