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

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

Change-Id: I0ce535a0031c2a743a9955af32314d4ba9c5f3b7