Merge "DO NOT MERGE Unit tests for NetworkNotificationManager"