[automerger skipped] Merge "Prevent apps from creating blocked channel groups"...

[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f17 -s ours am: dc2e9bd1 -s ours am: 93769d75 -s ours am: d9df899d -s ours am: a041ab4f -s ours am: cf44f89b -s ours

am skip reason: skipped by user juliacr

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

Change-Id: I03852c3011b900955665f09d84f3385d38c2e2d4