Merge "Removes unnecessary weak reference on the java object associated with" am: 244406a4f5 am: 7c40bef8d7 am: d60c6365fa

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

Change-Id: I5a9acb5afb33c6cfb94b931ca80e1cce8ed3b939