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

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



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