Merge "Merge "[TTC] Override touch feedback haptic settings" into udc-dev am: 4fac2a56 am: 570a99f5 am: 652e3b05" into udc-qpr-dev-plus-aosp am: da1c4a52

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



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