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 rvc-dev am: 584d1879

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



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