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

Merge "Implement a global maximum on number of shortcuts an app can publish" into tm-dev am: 118fcda1

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



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