Merge "Merge "Set mState = mCurrentStableState in onAnimationCancel()" into tm-dev am: b73c57b2 am: e19fbbbc" into tm-d1-dev-plus-aosp am: 3fb0d18a

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



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