[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: 4a34020f am: 51361020 -s ours am: 95f6f97d -s ours am: bd380fb2 -s ours am: b26a560d -s ours am: 00dc9638 -s ours am: 50dcdb17 -s ours am: 2f366064 -s ours am: 5a2b0b82 -s ours

am skip reason: subject contains skip directive

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



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