[automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel...

[automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel groups am: b993531c am: d761dbd9 -s ours am: 8b386cd9 -s ours am: 22244360 -s ours am: a51336f4 -s ours am: c3860fbb -s ours am: 6e0b3978 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4ccf4636b1a17f8ec47cc3023d672f1eafc5e6db