Merge "Tidy up" am: ec163bb9ab

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

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