Merge "Fix NetworkNotificationManagerTest"
am: c13a80deee

Change-Id: I8f02be13da5790d0fd60f04886e87de04c96de08