Merge "InputDispatcher: fix code for clang update" am: 2bde961aeb

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

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