Merge "Disable diag in libinput" into tm-dev am: a7b691bf am: 4644d8c7

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



Change-Id: Ie487f2f970a23c13d7aea77245f3a5cc1eeda5fb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>