Merge "Merge "Ensure weakly referenced callback fields are kept" into...

Merge "Merge "Ensure weakly referenced callback fields are kept" into tm-qpr-dev am: 71d0f222" into tm-qpr-dev-plus-aosp am: 930d5365

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



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