[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 qt-dev am: 7b0067c9 am: 05dd5f18 -s ours am: 0dbc3063 -s ours am: cb05a199 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I017d83c3446c9e5d52d5aaa96d69e96a4c913ec4