Merge "Flush the animation if it is canceled" into sc-dev am: ea428b55

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640272

Change-Id: I5463a8450d455f0a36e4c7e885473bfc4a7bbf69