Merge "Remove competing long haptic when user long presses on widget." into...

Merge "Remove competing long haptic when user long presses on widget." into tm-qpr-dev am: 112067ef

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



Change-Id: Ibc7f5d92eeb98d9e948bce9718bc34be25b166b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>