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: 02afba95 am: f5a4b7fd

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



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