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

Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca32 am: 95512285 am: 28e5984b am: 6f959a3c

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



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