[automerger skipped] Add a limit on channel group creation am: 0f29716ab6 -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: I0fbc063b473dd6b040aec88fc58bdcf327e5d68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>