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

[automerger skipped] Merge "[DO NOT MERGE] Turn off TRACKPAD_GESTURE_FEATURES am: de6804c0" into udc-mainline-prod am: e2e73d01 -s ours

am skip reason: subject contains skip directive

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



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