[automerger skipped] Merge "Fix testStressSwipeToOverview" into sc-dev am: aabead2db8 am: 5181163070 am: 8fdd7396ed -s ours am: 5adfb4d369 -s ours

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

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

Change-Id: I6c6245f4c473f150762555284106a2d057536e96