[automerger skipped] Merge "Don't stash immediately when drag was canceled" into tm-qpr-dev am: d9dd75d2cc am: 552fe5ec52 -s ours am: bfa4c67ac8 -s ours
am skip reason: Merged-In I06ca0eccbfe313dbae8f6d96c7c09bb659f6a27b with SHA-1 c691dcba5a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22316250
Change-Id: I563e5f946f033cd9fde5b2549b8bcaac1fa83092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: