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

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



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