[automerger skipped] Merge "Workaround for apps to stop before removing the task" into sc-dev am: 6420de7762 -s ours am: a9706d8e88 -s ours am: 48b609a75a -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: I85707a6871d68b80259c2ebd00f220b15f0e962d