[automerger skipped] Merge "Revert "Implement a global maximum on number of...

[automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda -s ours am: 7de9ed79 -s ours

am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 a8047ca3 is already in history

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



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