Merge "Prevent some leaks from leaking to the next test" into udc-qpr-dev am: 1e709c2a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24487871



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