Merge "Do not throw exception on task vanished" into tm-qpr-dev am: e572351d am: 1df1042d

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



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