DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of...
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. am: e4c02991 -s ours
am: fbbaf256 -s ours
Change-Id: I66000b3cd40a8494ad144610436f6ee953821a06