Merge "Put starting the animation back inside state changed check" into sc-dev am: 7395d119 am: 7c892f1b am: 9aba4598

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

Change-Id: I5d2a8fa748ab2f556ad171986b8701edbf55909f