Merge "Merge "Avoid bad animation states." into rvc-dev am: 5bef1eb6 am: 8bea4c00 am: 6837e8d2" into rvc-qpr-dev-plus-aosp am: 4155caa0

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

Change-Id: I79cd98b471d5ae367a8b81c2112d282c2511d8cc