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

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



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