Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc06439710 am: 3e759cc3a5 am: 5e918c2148 am: 2558b40966

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

Change-Id: Ic176c2dc1d15deba52cca4ce7a382468ec23ae72