Merge "Finish moving NetworkStats tests to tests/net" am: d72f5f7c9a am: cd821b231a
am: 544bcbe78e

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