DO NOT MERGE Unit tests for NetworkNotificationManager am: d3da17a260
am: 04507a635b  -s ours

Change-Id: Idd8f1032790fea21bf69a7e8e00744f0a1e5c3c5