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

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

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