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: fe5a8ce5

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



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