Merge "Align the scroll ballistics with the pointing ballistics." into udc-dev...

Merge "Align the scroll ballistics with the pointing ballistics." into udc-dev am: e34ee304 am: af407c18 am: 392a17b9 am: ce321107

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



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