Merge "[Do Not Merge] Revert "Implement a global maximum on number of...

Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4

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



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