Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc064397

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

Change-Id: I3424a6090a1646c995a47f6e82371b04b8d668cd