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

[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into sc-v2-dev am: 57cbfe19 am: 0fdb31ff -s ours

am skip reason: Merged-In Icc709a6b0d0a8c5f2d9243959992f1b6764354db with SHA-1 1d65ccb4 is already in history

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

Change-Id: I76bf5b28b8dcc6a3d7e8b7ee2f4f2783347f2aaf