Merge "Track closing tasks so we don't inadvertently hide the leash" into...

Merge "Track closing tasks so we don't inadvertently hide the leash" into udc-qpr-dev am: c1a17427

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



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