Merge 28c2392a on remote branch

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.vpn2.VpnSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>

        <activity android:name="Settings$SystemUpdateActivity"

        <item>com.qualcomm.qti.RIDL</item>

        <item>com.android.localphone</item>

        <item>com.android.sim</item>

        <item>com.android.wanadoo</item>

        <item>com.android.orangemail</item>

        <item>com.android.correoorange</item>

        <item>com.android.orangemobile</item>

        <item>com.android.multibox</item>

        <item>com.android.belgacom</item>

        <item>com.android.skynet</item>

        <item>com.android.telenet</item>

        <item>com.android.scarlet</item>

        <item>com.android.euphony</item>

        <item>com.android.voo</item>

        <item>com.android.tele2</item>

        <item>com.android.versatel</item>

        <item>com.android.tiscali</item>

        <item>com.android.swing</item>

        <item>com.android.versatelasdl</item>

        <item>com.android.brutele</item>

        <item>com.android.teledisnet</item>

        <item>com.android.tvcablenet</item>

        <item>com.android.mobistar</item>

        <item>com.android.vodafone</item>

        <item>com.android.hotmail</item>

        <item>com.android.sapo</item>

        <item>com.android.netcabo</item>

        <item>com.android.clix</item>

        <item>com.android.alice</item>

        <item>com.android.yahoo</item>

        <item>com.android.outlook</item>

        <item>com.android.sfr</item>

        <item>com.android.orange</item>

        <item>com.android.noos</item>

        <item>com.android.vodafone</item>

        <item>com.android.hotmail</item>

        <item>com.android.sapo</item>

        <item>com.android.netcabo</item>

        <item>com.android.clix</item>

    </string-array>

    <string-array name="plmn_list_for_apn_disable">

    <!-- Whether to show a preference item for the manual in About phone -->

    <bool name="config_show_manual">false</bool>

    <!-- only one provider that matches,flag show one email -->

    <bool name="config_show_email">true</bool>

    <!-- Whether to show a preference item for regulatory information in About phone -->

    <bool name="config_show_regulatory_info">false</bool>

    <bool name="config_regional_usb_tethering_quick_start_enable">false</bool>

    <bool name="config_regional_hotspot_tether_help_enable">false</bool>

    <!-- Config to enable/disable the USB line-->

    <bool name="config_usb_line_enable">false</bool>

    <bool name="config_show_dialog_open_wifi_when_tethering_open">false</bool>

    <bool name="config_regional_account_check_dialog_enable">false</bool>

    <!-- Tethering & Mobile HotSpots display summary on Tmoblie -->

    <bool name="config_tethering_settings_display_summary_Tmobile">false</bool>

    <!-- Config to Tethering & Mobile HotSpots display summary -->

    <bool name="config_tethering_settings_display_summary">false</bool>

    <!-- Config to enable/disable wifi call notification -->

    <bool name="config_regional_wifi_calling_notificaion_enable">false</bool>

    <bool name="config_regional_hotspot_show_maximum_connection_enable">false</bool>

    <string-array translatable="false" name="carrier_operator_list">

    </string-array>

    <bool name="config_regional_security_show_password_enable">false</bool>

</resources>

    <string name="lte_data_service_enabled">LTE data service enabled </string>

    <string name="turn_off_wifi_dialog_title">Turn off Wi-Fi</string>

    <string name="turn_off_wifi_dialog_text">Wi-Fi is turned off when Mobile HotSpot is active. To turn on Wi-Fi, please turn off Mobile HotSpot.</string>

    <string name="show_battery_percentage">Show battery percentage</string>

    <string name="show_battery_percentage_summary">Show battery level percentage inside the status bar</string>

    <string name="learn_usb_dialog_title">First Time Notification Use</string>

    <string name="learn_usb_dialog_text">Would you like to learn more about USB Tethering on your phone?</string>

    <string name="mobile_tether_help_dialog_title">Mobile HotSpot Help</string>

    <string name="mobile_usb_help_dialog_text">You can tether your Android device to your computer with a USB cable, to share your device\'s Internet connection with your computer. \n\n1. USB tethering works with Windows Vista, Windows 7, and Linux, the USB drivers for tethering may be needed.\n\n2. If your device has an SD card or USB storage, you can\'t mount it on your computer when USB tethered</string>

</resources>