[automerger skipped] Add a limit on channel group creation am: 0f29716ab6 -s ours am: 858113a72b -s ours am: 245ddb614a -s ours am: d1e75ee902 -s ours am: 6d1002180c -s ours am: 3876c12ed0 -s ours

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

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

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