Merge changes I62f1ef56,I5d20a393 into main

* changes:
  In ViewHierarchyAnimator, run onAnimationEnd even if anim was cancelled.
  Format ViewHierarchyAnimator + test