Merge "Uninstall the test apk after running the test" into pie-cts-dev