[automerger skipped] Merge "Add int range for touchscreen pointer id." into udc-dev am: eaef40dc am: 64f14cfb -s ours

am skip reason: Merged-In Ica8a3b5cc46517e6773c8c3a9d46e5606c63c00d with SHA-1 eb60a255 is already in history

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



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