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
am: a20ccdb0
Change-Id: I4aa888c55824eba58b7e0af78b510a144608e704