[automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda11 -s ours am: 7de9ed79fc -s ours am: 3f1534eb77 -s ours am: 5b6d285de8 -s ours am: 4aea16bab3 -s ours

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

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

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