More refactoring am: 848e6eeefb

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

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