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