DO NOT MERGE Stricter NetworkNotificationManagerTest am: a865790a5b
am: 2abde827c5  -s ours

Change-Id: I5146235a579a66e8101106f288624fa2c00c4d43