Merge "Move close callback outside ProgramList lock" into tm-qpr-dev am: 800f8fa2

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



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