Merge "CapturedTouchpadEventConverter: fix button reporting" into udc-dev am: 66fe0d3574 am: 8f30960508

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

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