[automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum...

[automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-v2-dev am: b99b7829 -s ours am: 730e786b -s ours am: a7086a95 -s ours

am skip reason: subject contains skip directive

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



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