Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b
am: 67401e25c2

Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c