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 am: cb312928

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



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