Merge "Add a limit on channel group creation" into sc-qpr1-dev am: 50afb87b

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



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