Merge "Reduce number of weakrefs per frame" into sc-dev am: a8bb1195 am: 82e00f01 am: 7169faef

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

Change-Id: I1537cdd26264c5cd19dd87bc9eea734650aaf121