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: 3e759cc3 am: 5e918c21

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

Change-Id: I4ca0c2e641fe54a08907862f4af77e1b59a4635d