Merge "Uninstall test apps in-between tests" into sc-dev am: 75e2b284 am:...

Merge "Uninstall test apps in-between tests" into sc-dev am: 75e2b284 am: 999bd81c am: f9e2cc3b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419576

Change-Id: I59a6c89fee7243ff396b4b89edbe499452109922