Merge "Add flags to the API changes in AnimationUtils and Choreographer" into main