[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: 82d30614 -s ours am: 07639f69 -s ours am: 9b7885ef -s ours

am skip reason: subject contains skip directive

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



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