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

[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc064397 am: 3e759cc3 am: 5e918c21 am: 2558b409 am: 3bbae40a am: 56088e16 -s ours

am skip reason: Merged-In I8a27853c7ed05d9dfd38a3142fbbe185946c3992 with SHA-1 074a7f4c is already in history

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

Change-Id: If5454fc4b46168a0af7aabf6113c07f0bca1a744