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

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

Change-Id: I2b1411d697f09b0b4afaf2a16c5448bc44223bef