[automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 am: cf3f62c4c9 -s ours am: 7a31586c29 -s ours am: 15dbdb2a73 -s ours am: 7e1bf5b798 -s ours am: 85671779f6 -s ours

am skip reason: subject contains skip directive

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

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