Merge "Avoid scrolling within edgeSensitivityWidth in overview tests" into sc-v2-dev am: 485f2a53b2 am: 5f61b2dc27

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

Change-Id: Ia9de754faac5ecc6bcd5a3de13d2dcf26a5a2a8f