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

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

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



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