Merge "Update string used as summary when an option is disabled by policy." into nyc-dev

    <string name="battery_info_status_full">Full</string>

    <string name="battery_info_status_full">Full</string>

    <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->

    <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->

    <string name="disabled_by_admin_summary_text">Disabled by administrator</string>

    <string name="disabled_by_admin_summary_text">Controlled by admin</string>

    <!-- Option in navigation drawer that leads to Settings main screen [CHAR LIMIT=30] -->

    <!-- Option in navigation drawer that leads to Settings main screen [CHAR LIMIT=30] -->

    <string name="home">Home</string>

    <string name="home">Home</string>