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

[automerger skipped] Add a limit on channel group creation am: 0f29716a -s ours am: 858113a7 -s ours am: 245ddb61 -s ours am: d1e75ee9 -s ours

am skip reason: Merged-In Ic27efba4c54e22eebca16fc948879e652df4467b with SHA-1 c1b83656 is already in history

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



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