[automerger] Revert "Set mState = mCurrentStableState in onAnimationCancel" am: d6692cedff am: 69652337ef

Change-Id: I7c546b292b952ebb7a20696859a7dfc3ec084aa5