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

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

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