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

[automerger skipped] Merge "Add a limit on channel group creation" into sc-qpr1-dev am: 50afb87b am: e7be52d1 -s ours am: 7f5dda7e -s ours am: 3ff4364f -s ours am: 317336a8 -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/+/21096683



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