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

Merge "Prevent apps from creating blocked channel groups" into rvc-qpr-dev am: f8994409 am: bf4e84b7

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

Change-Id: I33e2c8957e80528745c6d863ed247818b6081040