Merge "Fix extra haptic on swipe up" into sc-dev am: 516dfc6ace

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

Change-Id: Ib5911001ee68522f4d7248c8b0584736c22ae3cb