Merge "Remove AnimatorTestRule2" into udc-dev