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

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

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



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