Merge "Fix testStressSwipeToOverview" into sc-dev am: aabead2db8 am: 5181163070

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

Change-Id: I60cfcce0e6b946967025fbbf7a66b0ea10c53a2b