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

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

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

Change-Id: I7827b3a2bfba605b58c2954cca80e8f57d03ea77