[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into sc-dev am: 5769ab47bf am: 89c7ef75a7 am: 5c86f54b19 am: d8fd3ab144 -s ours
am skip reason: Merged-In I8a27853c7ed05d9dfd38a3142fbbe185946c3992 with SHA-1 074a7f4ccd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16623717
Change-Id: I9aefd68cc46291253104d4a1ce3011f112eb5467
This commit is contained in: