[automerger skipped] Merge "Fix deadlock due to callbacks in ProgramList" into...

[automerger skipped] Merge "Fix deadlock due to callbacks in ProgramList" into tm-qpr-dev am: 5355bffe am: e5e456e9 -s ours

am skip reason: Merged-In I196377ea030248a5d66a4db03ffb3bee4a70e633 with SHA-1 4ca33d65 is already in history

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



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