Merge "Override VelocityTracker strategy for non-differential axes only" into udc-qpr-dev am: 1bfaeebe3b

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

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