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

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

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

Change-Id: I63d62cd6994f4de188c23ca21d99d4c20e5607eb