[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: f4e13e6e -s ours am: 6dcb9e28 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6aa186c4b7047df5b1d3300346bc8e1c6997578b