Merge "Merge "Use WeakReference to hold target in values." into rvc-dev am:...

Merge "Merge "Use WeakReference to hold target in values." into rvc-dev am: 48866627 am: f4d5a310 am: 156f0eb7" into rvc-qpr-dev-plus-aosp am: 8ed51e6a

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

Change-Id: Id16455d65ee62fa9eec4952e5cafa627eaa4a12a