Merge "Move NetworkNotificationManagerTest to tests/net" am: c01fbf0f0c
am: 9fdc903af7

Change-Id: I06cec2595d67d029e08e4d556130c5956bfb387e