Merge "Prevent apps from creating blocked channel groups" into rvc-qpr-dev am: f8994409fe am: bf4e84b7ad am: a90a40ca59 am: cfe57a8e1a

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

Change-Id: I4175a1c74b4021028e08f023b5beaaa821771835