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

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

Change-Id: Ic411f43d0b59717a6bd911f4efae1358ad988964