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

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

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