Merge "Fix regression with the closing task leash visibility" into udc-qpr-dev am: 4760de84fa

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

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