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

Change-Id: I663f5ae4f1e15bd39e8ed927ac71958818452967