Merge "Ignore touchpad contacts that are marked as palms" into udc-dev am:...

Merge "Ignore touchpad contacts that are marked as palms" into udc-dev am: f8a49a24 am: a2f485d3

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



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