Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e76 -s ours am: feca77b8 -s ours am: 4c2371db Change-Id: I78a3f6ffb4e1906906bf218dd11c8f65c5d3c96b