Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel()"" into tm-dev am: 4608bd00

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18344362



Change-Id: Ia02117ac5242984e1f436bd69460af2bfc6255fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>