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

Change-Id: If85e483d5b44872c10e42ef55ddaf209601c7cfa