Merge "Improve Animator CTS test to rotate w/o activity recreation" into lmp-mr1-dev