[automerger skipped] Merge "Remove HID usage mapping for stylus buttons in Generic.kl" into main am: 3a25f1cc -s ours

am skip reason: Merged-In I580514bdcbbfbe93df83fa3faa6262077e881243 with SHA-1 9982f544 is already in history

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



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