[automerger skipped] Merge "Fix testStressSwipeToOverview" into sc-dev am:...

[automerger skipped] Merge "Fix testStressSwipeToOverview" into sc-dev am: aabead2d am: 51811630 -s ours am: 12e9e149 -s ours

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

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

Change-Id: I65f64c4bf572eafe59db8d3e3053557165f77a48