[automerger skipped] Merge "Remove HID usage mapping for stylus buttons in...

[automerger skipped] Merge "Remove HID usage mapping for stylus buttons in Generic.kl" into udc-qpr-dev am: 2a6a7493 am: 0e98f3e4 -s ours

am skip reason: Merged-In I580514bdcbbfbe93df83fa3faa6262077e881243 with SHA-1 5fb192aa is already in history

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



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