Merge "Modify the way AnimatableClockView applies isAnimationEnabled" into main