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

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

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



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