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

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

Change-Id: I38166fa0e820d8dcc76ac25b4c58687e02a2fddc