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: Ie13675a43f0ddf29f926292fb2813508d890b583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>