[conflict] Merge "Implement a global maximum on number of shortcuts an app can...

[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d1879 am: f9a6a136 am: bb4ff2e4 am: eee3312a am: 4611aa57 am: 69042ba5

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



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