[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 rvc-dev am: 15ae228d am: 1d4b9580 -s ours am: b8f5a215 -s ours

am skip reason: Merged-In I001c7a87b62aefa9487bf8efaf3cd02d7cb21521 with SHA-1 94437e98 is already in history

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



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