[automerger skipped] Merge "Override VelocityTracker strategy for...

[automerger skipped] Merge "Override VelocityTracker strategy for non-differential axes only" into udc-qpr-dev am: 1bfaeebe am: 6e486622 -s ours

am skip reason: Merged-In I702a2a3e58db3ce2e0ff0c33122839a527eebab2 with SHA-1 8a2e589e is already in history

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



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