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

Change-Id: I0f63e4f29228a404ec0dac3571b2474806e4c8d6
tree: 2c92cf4116fe1c7851d9f0b551a8e29a23f02f45
  1. core/
  2. services/
  3. tests/