[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: f5e46bc7 -s ours am: 4dbd550f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I768f2ff828b9fd1242b70c72555e9e010f86f142