[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 skip reason: subject contains skip directive

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



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