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

Change-Id: Ibba873042627166120f4040896c58e96bff2b085
tree: ed7169d61230d6c8ae00a889138df4fe8e9da578
  1. core/
  2. services/
  3. tests/