am 6c71d476: (-s ours) am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005.

Merge commit '6c71d476f32adb5308a2a9e32660b66b2b7e6c1a'

* commit '6c71d476f32adb5308a2a9e32660b66b2b7e6c1a':
  Manual merge of 40080 DO NOT MERGE