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

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

Change-Id: I2c6bdc0b3c8c5a486f87fc16faf06790ca4bfc1e