[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours am: 91fbccc817

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

Change-Id: Ia1478dc08a058aa3abdc34f5cd4b03be842a17ed