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: I015c69b5fe17e6ef1ef8d0b7c722b0edddfead1a