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

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



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