Merge "Fix unbounded number of uncached shortcuts" into tm-qpr-dev am: 00825873 am: 57cc8e03

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



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