Merge "Fix overview scroll triggering haptics on swipe up gesture" into sc-v2-dev am: d8a1b5c3

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

Change-Id: I8b3a32fd3c115a4f4276add4450a7f07081a1336