[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: 4fbf54f9 -s ours am: 67310407 -s ours

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

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



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