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

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

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