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

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

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