[automerger skipped] Merge "Prevent apps from creating blocked channel groups"...

[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into sc-qpr1-dev am: 74efab0a am: 71c862fc am: 2efb5e93 -s ours

am skip reason: Merged-In I8a27853c7ed05d9dfd38a3142fbbe185946c3992 with SHA-1 074a7f4c is already in history

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

Change-Id: I127f2cfca9c2e0dfef7cd852e444d3f03338a97f