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

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

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

Change-Id: I31496632cf97d2c156a6939a2c9bf34006dd764c