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 am: 69b19f37

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



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