Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev

    <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->

    <string name="wifi_wps_nfc_enter_password">Enter your network password</string>

    <!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=40] -->

    <string name="wifi_carrier_connect">Carrier Wi\u2011Fi network</string>

    <!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=60] -->

    <string name="wifi_carrier_content">Connect via <xliff:g id="name">%1%s</xliff:g></string>

    <string name="wifi_scan_always_turnon_message">To improve location accuracy and for other purposes, <xliff:g id="app_name">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?</string>

    <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->

    <string name="wifi_scan_always_turnoff_message">To turn this off, go to Advanced in the overflow menu.</string>