[automerger skipped] Merge "Implement a global maximum on number of shortcuts...

[automerger skipped] Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev am: e51fb72b -s ours am: 63d803e6 -s ours am: 62945c47 -s ours am: 9507b446 -s ours

am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6 is already in history

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



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