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

[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into pi-dev am: 1735cdee -s ours am: 76a15c06 -s ours am: e0a844da -s ours am: eff05e86 -s ours am: 79ba5701 -s ours

am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 88380a00 is already in history

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

Change-Id: Ic69dbc845e53a391ca498dc49924441e8744e533