[automerger skipped] DO NOT MERGE: Add remapping for an Android stylus am:...

[automerger skipped] DO NOT MERGE: Add remapping for an Android stylus am: 87128357 am: 657125d4 -s ours

am skip reason: subject contains skip directive

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



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