Merge "Revert "Implement a global maximum on number of shortcuts an app can...

Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into tm-dev am: fb4be8c3 am: 8a0fe065 am: 42153dae

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



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