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

[automerger skipped] Add a limit on channel group creation am: c1b83656 -s ours am: 68c73637 -s ours am: 6710d214 -s ours am: ca37c756 -s ours am: 7a88f5c5 -s ours am: a1cb2d32 -s ours

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

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



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