[automerger skipped] [Do Not Merge] Revert "Implement a global maximum on...

[automerger skipped] [Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish" am: b71ba5fb -s ours am: c89eaa8d -s ours am: 264d3e63 -s ours

am skip reason: subject contains skip directive

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



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