Merge "Readd needed string"

    <!-- [CHAR LIMIT=25] Title of developer tile to toggle layer trace -->

    <string name="layer_trace_quick_settings_title">Surface Trace</string>

    <!-- Template for formatting country and language. eg Canada - French [CHAR LIMIT=NONE]-->

    <string name="support_country_format"><xliff:g id="country" example="Canada">%1$s</xliff:g> - <xliff:g id="language" example="French">%2$s</xliff:g></string>

    <!-- [CHAR LIMIT=60] Title of work profile setting page -->

    <string name="managed_profile_settings_title">Work profile settings</string>

    <!-- [CHAR LIMIT=60] The preference title for enabling cross-profile remote contact search -->