Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev

                new String[]{"default", "mms", "dun", "supl"});

        sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,

                new String[]{"default", "mms", "dun", "supl"});

        // By default all APNs are unmetered if the device is on IWLAN.

        // By default all APNs should be unmetered if the device is on IWLAN. However, we add

        // default APN as metered here as a workaround for P because in some cases, a data

        // connection was brought up on cellular, but later on the device camped on IWLAN. That

        // data connection was incorrectly treated as unmetered due to the current RAT IWLAN.

        // Marking it as metered for now can workaround the issue.

        // Todo: This will be fixed in Q when IWLAN full refactoring is completed.

        sDefaults.putStringArray(KEY_CARRIER_METERED_IWLAN_APN_TYPES_STRINGS,

                new String[]{});

                new String[]{"default"});

        sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY,

                new int[]{