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

Merge "Merge "Disable diag in libinput" into tm-dev am: a7b691bf am: 4644d8c7" into tm-d1-dev-plus-aosp am: 7b93a149

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



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