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

[automerger skipped] Merge "Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc064397 am: 3e759cc3 am: 5e918c21 am: 2558b409 am: a27683f3" into sc-v2-dev-plus-aosp am: 31f0de5b -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: Iecc294b8d92214fb3acac1a376838589f221ca27