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

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

Change-Id: I5bf758cdedc68760e0397c423cc748c719fd4f71