Merge "Limit the number of shortcuts per app that can be retained by system"...

Merge "Limit the number of shortcuts per app that can be retained by system" into tm-qpr-dev am: b3e99da8

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



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