[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: d9df899df2 -s ours am: a041ab4fa8 -s ours am: 31257eb62e -s ours am: d0a0322c9b -s ours
am skip reason: skipped by user juliacr Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624026 Change-Id: Iaa2d0066d47fec9eed5b5623c44499dd286fc5bc
This commit is contained in: