Merge "[TTC] Override touch feedback haptic settings" into udc-dev am: 4fac2a56 am: 0aabfbde

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



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