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

Change-Id: Ic38e6db9bb62e04d017db93e906be2be02a33294