Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc064397 am: 3e759cc3

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

Change-Id: Ia76ba167a040f606c4a847b62546c6fcada1d530