[automerger skipped] Merge "Track pending task info & if the task doesn't...

[automerger skipped] Merge "Track pending task info & if the task doesn't launch clean it up" into udc-dev am: b541d4cd am: c4d1b8fb am: 78b36b4d -s ours am: ce7f7e7f -s ours

am skip reason: Merged-In I28e0b2c60889d38f422831935564ef739fd3ef3c with SHA-1 29988a3c is already in history

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



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