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

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



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