[automerger skipped] Merge "Limit the number of shortcuts per app that can be...

[automerger skipped] Merge "Limit the number of shortcuts per app that can be retained by system" into tm-dev am: 7b47cfaf am: e63bce70 -s ours am: eb1c9774 -s ours

am skip reason: Merged-In I001c7a87b62aefa9487bf8efaf3cd02d7cb21521 with SHA-1 2296ccfd is already in history

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



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