[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: 882759b3 -s ours am: a4845db3 -s ours am: c6e54cab -s ours am: 955992b8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibfc5f5739f4416ae81cb940015dde136c4275a64