Merge "Add a limit on channel group creation" into sc-dev am: 63eb701724 am: 56a635c635

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

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