Merge "CapturedTouchpadEventConverter: fix button reporting" into udc-dev am:...

Merge "CapturedTouchpadEventConverter: fix button reporting" into udc-dev am: 66fe0d35 am: b83b90cc am: b1d8b4eb am: 7cbee435

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



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