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

Change-Id: I5d9a01a5804a7cc6289253db09078ede00fc0dc5