[automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00d5 am: 3c507386ca -s ours am: 11f4032b5e -s ours am: 80fa91b134 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411 Change-Id: I0177e839e6b6c6e627a9d75d07673c07f84fc1f7
This commit is contained in: