[automerger skipped] Merge "[DO NOT MERGE] Turn off TRACKPAD_GESTURE_FEATURES"...

[automerger skipped] Merge "[DO NOT MERGE] Turn off TRACKPAD_GESTURE_FEATURES" into udc-dev am: 1f8d035f am: 9429dcd1 am: 38a0819c am: f2623dc4 -s ours

am skip reason: subject contains skip directive

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



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