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

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



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