Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel()"" into...

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

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



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