[automerger skipped] Merge "Move close callback outside ProgramList lock" into...

[automerger skipped] Merge "Move close callback outside ProgramList lock" into tm-qpr-dev am: 800f8fa2 am: f687c360 -s ours

am skip reason: Merged-In I9c668c63a578ba04b52747e0ef96e9e67cc00b72 with SHA-1 1fcf05bb is already in history

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



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