Manual merge of 40080 DO NOT MERGE
Properly notifies listener when an animation is cancelled.
Bug: #2428005.
2 files changed