Merge "Fix wrong pointer count logic for trackpad back events" into udc-dev...

Merge "Fix wrong pointer count logic for trackpad back events" into udc-dev am: 7664af5e am: 96a098ba

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



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