Merge "Uninstall the test app in shutdown" am: c55691b7de am: cc9a31aa11

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

Change-Id: Iea2f49572cc1e12276ebe6cb36b4a301d9af4d5b