Merge "Cancel pending animation when state changed." into udc-dev am: 0f6ed614 am: da6aac40

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



Change-Id: I6882b12347ea678d18668a095e264374174c1127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>