[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 oc-mr1-dev am: 6cc887c0 -s ours am: 2bec84a7 -s ours am: 9cd02f1d am: 22feb668 -s ours am: 91fbccc8 am: 18252b29 am: e5f2ad12 -s ours am: 17764cc5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I79dbdb02a0abe0f6b1350741d8d910f190cb59e0