Merge changes from topic "revert-2625691-VFGNHGHBMX" am: 2fa3dd0149

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

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