Merge "Move NetworkNotificationManagerTest to tests/net" am: c01fbf0f0c am: 9fdc903af7
am: 777bf77c2c  -s ours

Change-Id: I0f63e4f29228a404ec0dac3571b2474806e4c8d6