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

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

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