Merge "Prevent apps from creating blocked channel groups" into sc-dev am: 5769ab47 am: 89c7ef75

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

Change-Id: I6f5ab5a891962742e3ecc038055e4835d5cbb6a7