Merge "Merge \\"Fix setCurrentPlayTime for started but not yet pulsed animations\\" into nyc-dev am: 42d39300cf am: a28f0003eb" into nyc-mr1-dev-plus-aosp