Merge "Trying to fix flaky TAPL test on CF" into tm-qpr-dev am: 7c8ee4f8

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



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