Merge "Fix weak global reference overflow" am: d1a6cd91 am: 199deef1

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



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