resolve merge conflicts of 7e0586b7 to master.

    <string name="keywords_default_apps">apps, default</string>

    <string name="keywords_ignore_optimizations">ignore optimizations, doze, app standby</string>

    <string name="keywords_color_mode">vibrant, RGB, sRGB, color, natural, standard</string>

    <string name="keywords_color_temperature">color temperature D65 D73 white yellow blue warm cool</string>

    <string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string>

    <string name="keywords_profile_challenge">work challenge, work, profile</string>

    <!-- Name of option to remove a suggestion from the list [CHAR LIMIT=30] -->

    <string name="suggestion_remove">Remove</string>

    <!-- Name of the setting to change the display's color temperature -->

    <string name="color_temperature">Display color temperature</string>

    <!-- Description of the setting to change the display's color temperature -->

    <string name="color_temperature_desc">Enable cool temperature</string>

</resources>