[automerger skipped] Merge "Mark stylus buttons mapppings as fallback" into...

[automerger skipped] Merge "Mark stylus buttons mapppings as fallback" into main am: f45ca2ce am: bd9782b3 am: 8879f3f8 -s ours

am skip reason: Merged-In I45710f9e6237c86613717fab779dbd7cc5c66c86 with SHA-1 45f626a1 is already in history

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



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