Bug: 109889733 Test: runtest systemui-notification Change-Id: I5ed599deca83f97899affce44e3ed8fbcacae366 (cherry picked from commit 218871ee) (cherry picked from commit 89945c5a)