[automerger skipped] Merge "Fix flaky/failing two panel TAPL tests" into tm-qpr-dev am: 21064ef82a am: 2a08b1c5b6 -s ours

am skip reason: Merged-In Ib154cf97040fcea3b4d2d7082352c06de74f8c2a with SHA-1 486f7c8766 is already in history

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

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