Add a better notification test and clean up the flag handling in the notification builder.

Change-Id: I9354ed2c2cda690f53e5f43ad60943b63b02e7d4
6 files changed