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: 20be3730

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



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