Merge "Put starting the animation back inside state changed check" into sc-dev...

Merge "Put starting the animation back inside state changed check" into sc-dev am: 7395d119 am: 3afd0c64 am: d07a7825

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

Change-Id: Ifff9f825f4bfbfad04e04e8497e2e9feb9450228