Merge "Fix NetworkNotificationManagerTest" am: c13a80deee
am: 13f0d10115

Change-Id: Icf4e4e9c9dde7f6c8308adb79e3ca8b63d6f604b