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

[automerger skipped] Merge "Merge "Prevent apps from creating blocked channel groups" into sc-qpr1-dev am: 74efab0a am: 39ddbbc8" into sc-v2-dev-plus-aosp am: 80c5689f -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: Ia0835293a59fb8e9dbe5aeb4eafc75d7a40b2811