[SM07] Make combine subtype configurable from Settings am: 4e63e42a57 am: 53651df7f8

Change-Id: I65470e2ce4aae26308a395ce1e5465ac27914f60

tests/net/java/com/android/server/net/NetworkStatsServiceTest.java

@@ -1294,6 +1294,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
         when(mSettings.getPollInterval()).thenReturn(HOUR_IN_MILLIS);
         when(mSettings.getPollDelay()).thenReturn(0L);
         when(mSettings.getSampleEnabled()).thenReturn(true);
+        when(mSettings.getCombineSubtypeEnabled()).thenReturn(false);
 
         final Config config = new Config(bucketDuration, deleteAge, deleteAge);
         when(mSettings.getDevConfig()).thenReturn(config);