Merge "Merge "Prevent apps from creating blocked channel groups" into rvc-dev...

Merge "Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc064397 am: 5f9f8f23" into sc-dev am: 6f4654c6 am: a9e73ff7 am: 0e462ae8

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

Change-Id: I301fabee47fe1bc2cc1ce92bf500f6ad45edae36