[automerger skipped] Merge "Add a limit on channel group creation" into sc-dev...

[automerger skipped] Merge "Add a limit on channel group creation" into sc-dev am: 63eb7017 am: 56a635c6 am: b71118c6 -s ours am: 4ea0388d -s ours am: d316c230 -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/+/21095328



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