[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: ec769a75 -s ours am: 87c76c5a -s ours am: a7423a85 -s ours am: 1a499781 -s ours am: d1ef9a5e -s ours

am skip reason: skipped by user juliacr

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

Change-Id: I6372f37a46af0c1e38c6d1c651b5878639897a40