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

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

Change-Id: I1fa439f79be0a9ba66c825f1c9a266109777fc68