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

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

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