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: d591db8b

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



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