Merge "DO NOT MERGE: Add remapping for an Android stylus" into tm-qpr-dev am: 8b70e07466

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

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