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

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

Change-Id: I593393e4d901c04a081aa146cef5c3e6ab0e9ae8