Merge "Fix weak global reference overflow" am: d1a6cd9185

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

Change-Id: I4687ab8f7f5bc2955975b717cf354c77ad5eb6de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>