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