[conflict] Merge "InputDispatcher: fix code for clang update" am: 2bde961a...

[conflict] Merge "InputDispatcher: fix code for clang update" am: 2bde961a am: 8e0107a7 am: bca972ba

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



Change-Id: Ie463ef83f75efe0cca36f12b0fdf8376c0bec275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>