[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: 45c4c9f1 -s ours am: f8930138 -s ours am: 359d27b5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I84c2d0d68d33450137950c83cc5d470cc9be3fdb