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

[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev am: f1dc5b1e am: 960d42c0 -s ours am: 2675838e -s ours am: 09a1321d -s ours am: b9894cc6 -s ours am: 07860795 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I122c712a65e80766a0c15ad3253f85cb1f5834a5