[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-qpr-dev am: ced44641 am: b2f7cb74 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib146b5111d80653b9b1dbb0a87567e7e3f7b2b99