Merge "Migrate NetworkStatsServiceTest from when().thenReturn() to doReturn().when()"