DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 77cba4bdf6 -s ours
am: 82393f7b98 -s ours
Change-Id: I175601094ae486700c8a6886470abb3147b6ef4e
This commit is contained in: