Merge "Expose AnimationUtils#lockAnimationClock for tests"