Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655  -s ours
am: feca77b884  -s ours

Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76