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

Change-Id: Ie7c8890bf9aea1db9f6616ef1ed40955335581e2