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

[automerger skipped] Merge "Add a limit on channel group creation" into sc-v2-dev am: a9fbead1 -s ours am: 903647e0 -s ours am: afc16126 -s ours am: 89a921ad -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/+/21096603



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