Merge changes from topic "presubmit-am-41f55ec06ce44b7aaf10c778037774c5-sc-dev" into sc-mainline-prod

* changes:
  [automerge] Lower per-app notificationchannel limit 2p: 36acdd6758
  Lower per-app notificationchannel limit