Merge "Move some NetworkStats tests to tests/net." into oc-dev am: 74fe2cbc3a  -s ours
am: ea28d269ea  -s ours

Change-Id: I40b5bb1e640358e6889f92dacdd2a977bc9758fb