Merge "Disallow interception of multitouch events" into tm-qpr-dev am:...

Merge "Disallow interception of multitouch events" into tm-qpr-dev am: def6a36f am: 283122b1 am: e1470e59

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



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