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

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

Change-Id: I4cc732fba700dba73d695166435f4f22994b7e31