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

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

Change-Id: I177cf5d48ce58cd1f5f8002753110d6d1208464b