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

Merge "Prevent apps from creating blocked channel groups" into sc-qpr1-dev am: 74efab0a am: 71c862fc

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

Change-Id: I42e682ba90c9be325259d3b1f6518350496c9f5a