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

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



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