Merge "Lower per-app NotificationChannelGroup limit." into tm-dev