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 am: c4d1b8fb

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



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