[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 sc-dev am: d8bf6af4 am: 2e79de04 am: 3f71147e -s ours

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

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



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