Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca32

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



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