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

Change-Id: I4acc3df60493e5ac388772f8c0e22ac92bc3ce4c