Merge "Track pending task info & if the task doesn't launch clean it up" into...

Merge "Track pending task info & if the task doesn't launch clean it up" into udc-dev am: b541d4cd

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



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