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

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

Change-Id: Ib4ef0986f08fa028f52ce3567871b963ee742dd2