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: 4fc8a123

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



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