[automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00d5 am: 3c507386ca -s ours am: 11f4032b5e -s ours
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: Ic61ea6e91daf56b0bbdb565d52c868b3b5bc621e
This commit is contained in: