DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 77cba4bdf6  -s ours am: 82393f7b98  -s ours am: 854038fcd8
am: 05b9f210af  -s ours

Change-Id: I9979e5411c032f500995efe7c83df31d40fda0f5