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

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

Change-Id: I52472c39ccd290ef1010e467645619df5f4104ee