commit 798a248e0a498de30f90cf3c082fe3b26fce0edb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 07 23:51:37 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 07 23:51:37 2022 +0000
tree 31a96158ae4185264831a3f7e78e53c87725dae8
parent f0c4b5fc7049b6301eb01ff29e8d5adc6ee505fa
parent 47bef657953ebdb11687005bfd28bf6082454297

Merge changes from topic "am-16951e85df6d42e5b2530da903446616"

* changes:
  [automerger skipped] Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev am: e51fb72b75 -s ours am: 63d803e611 -s ours am: 62945c47b9 -s ours am: 9507b44655 -s ours am: db3c399fc8 -s ours
  [automerger skipped] Implement a global maximum on number of shortcuts an app can publish am: 7622d6da0e -s ours am: 800028ab88 -s ours am: 983196d8ec -s ours am: 654a4b35a2 -s ours am: 3598883b9a -s ours