Improve notification style comparisons

Bug: 178272497
Test: atest SystemUITests
Change-Id: I9b1a55834360e48e83c09dc1d61b9b35f1f6ec09
12 files changed