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

[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into rvc-qpr-dev am: f8994409 am: bf4e84b7 am: a90a40ca am: cfe57a8e am: 252e2809 -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/+/16623721

Change-Id: I574de38509687f6b9a267571ac077c2f0ad7e66b