[automerger skipped] Merge "Fix overview scroll triggering haptics on swipe up...

[automerger skipped] Merge "Fix overview scroll triggering haptics on swipe up gesture" into sc-v2-dev am: d8a1b5c3 am: 49584c34 -s ours

am skip reason: Merged-In I9b29981dba408493c78873aea42d8615ea7573a0 with SHA-1 bff03e2d is already in history

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

Change-Id: I0b4c80606d73c6cb3d27dc6e26879622fedb2241