Merge "Use VelocityTrackerStrategy values from aidl" into main