Merge "Remove the tasks created by the organizer when it dies." into tm-dev am: 5e5efacd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128140



Change-Id: Ic39e6145f2d0f0e9932d8209ace4f63757f6d39a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>