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

[automerger skipped] [automerge] Revert "Implement a global maximum on number of shortcuts an app can publish" 2p: a8047ca3 am: 66172edd -s ours am: 74cb12fe -s ours am: 56ddde2f -s ours am: 8a2c66c5 -s ours am: 9240b791 -s ours am: 2381e94d -s ours

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

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



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