Merge "Merge "Reduce number of weakrefs per frame" into sc-dev am: a8bb1195...

Merge "Merge "Reduce number of weakrefs per frame" into sc-dev am: a8bb1195 am: c2697f38" into sc-v2-dev-plus-aosp am: ae531001

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

Change-Id: If6019735186a481fa5c4b6a6410e7e5dbd696597