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

[automerger skipped] Merge "DO NOT MERGE: Add remapping for an Android stylus" into tm-qpr-dev am: 8b70e074 am: 2ed875c1 -s ours

am skip reason: subject contains skip directive

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



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