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

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

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