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