Merge "Fix end() for infinite AnimatorSet" into oc-mr1-dev am: aace655509
am: 198cde9450

Change-Id: I61d75f633885911a2a5db3cd628960803c31dcc0