[automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel groups am: b993531c0d am: d761dbd934 -s ours am: 8b386cd940 -s ours am: 222443606d -s ours am: a51336f4e6 -s ours am: c3860fbb7c -s ours am: 6e0b3978df -s ours am: 3bd973f76e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id79cac132ec3024fa7df6ac213089066d67264a5