Merge "Clean up some AnimatorTestRule usages" into udc-qpr-dev