Merge "Cleanup tapl test workaround" into tm-dev am: fd64b4f2b3

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

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