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

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



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