[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 rvc-dev am: 28dae0e4 am: cf3f62c4 -s ours am: 7a31586c -s ours am: 15dbdb2a -s ours am: 7e1bf5b7 -s ours am: 85671779 -s ours am: fd017d9e -s ours am: a1596354 -s ours

am skip reason: subject contains skip directive

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



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