Merge "Merge "Set TOUCHPAD_NATURAL_SCROLLING default value to 1" into udc-dev am: c83bad26 am: 27738ac1 am: c1715d8b" into udc-qpr-dev-plus-aosp am: 18e11499

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



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