[automerger skipped] Merge "Fix testStressSwipeToOverview" into sc-dev am: aabead2db8 am: b3b4bc0e2a -s ours

am skip reason: Merged-In I19616f7921c9821f1b45a90a3e4bec4fb3b8a9d3 with SHA-1 ce6bf7dd7f is already in history

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

Change-Id: Ie228253d9aef7774104c531dcaa3fdde62764ecb