[automerger skipped] Add a limit on channel group creation am: 44440649 -s...

[automerger skipped] Add a limit on channel group creation am: 44440649 -s ours am: 60402fa0 -s ours am: e08ef3dc -s ours am: ae7a9e4b -s ours

am skip reason: Merged-In I3f3a99765c161369e1b026686a0e5f0c83ed839e with SHA-1 0c94ea39 is already in history

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



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