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

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



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