[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: 3201b6ee -s ours am: 17babeb9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie895afc3a6d22285d84dbf1a55bf5b01b117b48f