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

Change-Id: I6b9360bdbb145d4d0b6947ae11dd9dce7bdcbd5e