[automerger skipped] Merge "Cancel manual animation if LauncherState changes during drag." into 24D1-dev am: 85e9c6f1a2 -s ours

am skip reason: Merged-In I6364dbde8aea67f5d1c525edf57ed7eb26096cf9 with SHA-1 22dee942b5 is already in history

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

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