Merge "Ensure weakly referenced Kotlin callback fields are kept" into tm-qpr-dev am: 5f12d744

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



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