Merge "Tidy up" am: ec163bb9ab am: 4b8848277a am: 29ef4abae5

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

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