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

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

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