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

Change-Id: Ic9f06631a7f937a0f3730b167e5db7d8c0dcf775