Merge "Remove conflicting vibration-only haptic causing inconsistent touch...

Merge "Remove conflicting vibration-only haptic causing inconsistent touch feedback." into tm-qpr-dev am: b4c05895

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20326199



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