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 am: a90a40ca

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

Change-Id: I4bcee07381d97e2d2637741af14e0a4f1a454f83