[automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-v2-dev am: b99b78291b -s ours am: 730e786b73 -s ours am: 0200a32954 -s ours am: 4e1e8a0456 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20749901 Change-Id: I61ef5e3fb4b851bd8e8169e1bfb1c6176bdbca88 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: