Merge 6e8046e4 on remote branch

    <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />

    <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>

    <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>

    <uses-permission android:name="android.permission.ACCESS_IMS_CALL_SERVICE" />

    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher_settings"

    <string name="notify_connect">连接CMCC告警</string>

    <string name="notify_connect_summary">连接到CMCC热点后提示</string>

    <string name="wifi_setting_connect_type_error">设置自动连接类型时出现错误。</string>

    <string name="wifi_advanced_gateway">网关</string>

    <string name="wifi_advanced_network_netmask">子网掩码</string>

    <string name="label_global_roaming_settings">国际漫游设置</string>

    <string name="set_data_time_range">显示时间区间</string>

    <string name="app_ops_permiss_name">应用联网限制</string>

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

    <!-- show pop up notification for turn off wifi begin -->

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

    <!-- Whether to enable the default ipv4/v6 for creating new APN -->

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

</resources>

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

    </string-array>

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

    <!-- Config to show bluetooth menu-->

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

</resources>

    <string name="notify_connect">CMCC WLAN prompt</string>

    <string name="notify_connect_summary">Prompt me when access to CMCC WLAN</string>

    <string name="wifi_setting_connect_type_error">There was a problem setting the connect type.</string>

    <string name="wifi_advanced_gateway">Gateway</string>

    <string name="wifi_advanced_network_netmask">Netmask</string>

    <string name="app_ops_permiss_name">App network access</string>

    <!-- Roaming Data Settings -->

    <string name="turn_on_wifi_dialog_title">Turn on wifi</string>

    <string name="turn_on_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="dialog_not_show_again">Do not show again</string>

    <string name="volte_preferred">Volte Preferred</string>

    <string name="tethering_settings_summary">Share your device\'s mobile data connection via USB or a Mobile HotSpot</string>

    <string name="collect_diagnostics_title">Collect Diagnostics</string>