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

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

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



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