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

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



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