Revert notification patterns to default pre-S ones [DO NOT MERGE]

Bug: 210535717
Test: manual
Change-Id: I6ead011f1cc28ea0c061941ab1665ed8250c3784
2 files changed