Merge "Prevent apps from creating blocked channel groups" into rvc-qpr-dev am: f8994409

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

Change-Id: I0d9da9d18fd1b256847774d3028219700a23b397