Merge "Disable diag in libinput" into tm-dev am: a7b691bf am: 79e807af am:...

Merge "Disable diag in libinput" into tm-dev am: a7b691bf am: 79e807af am: c21c971c am: cf18d74b

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



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