Merge "Prevent apps from creating blocked channel groups" into sc-v2-dev am: 57cbfe19

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

Change-Id: I73117306c1d1b596b984d7adc9c713946818899d