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

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

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