Merge "Add multitouch to new touch architecture" into tm-qpr-dev am: fa87b00c96

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

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