[automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS...

[automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00 am: 3c507386 -s ours am: 11f4032b -s ours

am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a8 is already in history

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

Change-Id: Ied527f94280f1eea4893d993a1120ea1a554abbf