tree 70707c563daa0d352f1d94987f75d9d11b853ca6
parent 17babeb9f13d2a2f1c97c4b9304bd7213c1f4221
parent 79ba5701cdc6505adc1494c208ff2649000311f4
author Chris Tate <ctate@android.com> 1619565237 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619565237 +0000

[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into pi-dev am: 1735cdeea4 -s ours am: 76a15c06f4 -s ours am: e0a844da8b -s ours am: eff05e86d3 -s ours am: 79ba5701cd -s ours

am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 88380a00d5 is already in history

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

Change-Id: Ic69dbc845e53a391ca498dc49924441e8744e533