Merge "Update trackpad related feature flags in SysUI" into udc-dev am: 3e21fcb3 am: 08475098

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



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