[automerger skipped] [Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish" am: 4a34020ffc am: 51361020b4 -s ours am: 95f6f97d5b -s ours am: bd380fb2bd -s ours am: b26a560df5 -s ours am: 00dc9638d9 -s ours am: 50dcdb177e -s ours am: 2f366064f2 -s ours

am skip reason: subject contains skip directive

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

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