Merge "Fix crash caused by accessing finishing task" into tm-qpr-dev am: 2e0ed6a6

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



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