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: 6c2468ca

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



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