Merge "[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into sc-qpr1-dev am: 74efab0acc am: 71c862fc92 am: 2efb5e937f -s ours"