[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 rvc-dev am: 68a604b9 am: 1de72903 am: ac47f8e9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iaf95015ea4dbd9435641419a85d217778c69bfea