This reverts commit d691f1a200, reversing changes made to d6a2ed194c. Test: runtest systemui-notification Fixes: 63920384
d691f1a200
d6a2ed194c