[automerger skipped] Merge "Workaround for apps to stop before removing the task" into sc-dev am: 6420de77 -s ours

am skip reason: Merged-In Ib3ea479643d65859fe4cd580b4c347b87130a69d with SHA-1 ccda7bc7 is already in history

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

Change-Id: I4e5547530fc1ad4284fe076fe87bed7149db7ed7