DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: bf499379b8 -s ours am: 82393f7b98 -s ours am: e5f4778f04
am: ead62d1cd7 -s ours
Change-Id: I9979e5411c032f500995efe7c83df31d40fda0f5
This commit is contained in: