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

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

Change-Id: I2465f81760a1f52f026c08c4bb3bde7db8053997