Merge "Ignore additional pointers in dispatchTouchEvent." into rvc-dev am: fe71adaa65 am: 3804d96d6b am: ffc87ece03

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

Change-Id: Id0f0e94c4b43845bfca9215945a68131eea5222d