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

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



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