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 am: 1ef445b8 am: 9ca4ef96

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



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