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

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

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

Change-Id: I27121a2d3bd25ceef5b3ea8d0f10c68be90fc35f