[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f1715 -s ours am: dc2e9bd10f -s ours am: 93769d75c3 -s ours

am skip reason: skipped by user juliacr

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

Change-Id: I5a06ee19e43207e75d87526a0132f2cad108f2bc