am 1af08260: am 5e1b2395: am 298eb3cb: am 49982a1f: Merge "Fix AnimationUtilsTest failure due to the timing dependency"

* commit '1af08260ddd6f8ec51bd3675059d9018d87d32f4':
  Fix AnimationUtilsTest failure due to the timing dependency