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

[automerger skipped] Merge "Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc064397 am: 5f9f8f23" into sc-dev am: 6f4654c6 am: 25adc0a0 -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/+/16624024

Change-Id: Iaa858fbf44097fb8f1bfcab0243254034ea3d422