[automerger skipped] Merge "Add a limit on channel group creation" into sc-dev am: 63eb701724 am: 56a635c635 am: b71118c6ad -s ours am: 4ea0388d87 -s ours am: 6530bc054a -s ours am: 7470225cfb -s ours

am skip reason: Merged-In I3f3a99765c161369e1b026686a0e5f0c83ed839e with SHA-1 0c94ea3939 is already in history

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

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