Merge "Check pointer count for trackpad gesture features" into udc-dev am:...

Merge "Check pointer count for trackpad gesture features" into udc-dev am: 0674cd7e am: 5cd08667

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



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