Add support for localized time strings with two units, eg. "2 hours 17 minutes"

ash/system/logout_button/logout_confirmation_dialog_view.cc

Index: ash/system/logout_button/logout_confirmation_dialog_view.cc
diff --git a/ash/system/logout_button/logout_confirmation_dialog_view.cc b/ash/system/logout_button/logout_confirmation_dialog_view.cc
index b26d42fc8db13bbc131256ddb5c352886b3266a0..568bfa19cd0b05d3faaf675c5d5b5f4a72ce658e 100644
--- a/ash/system/logout_button/logout_confirmation_dialog_view.cc
+++ b/ash/system/logout_button/logout_confirmation_dialog_view.cc
@@ -123,8 +123,9 @@ void LogoutConfirmationDialogView::UpdateCountdown() {
   if (seconds_remaining > 0) {
     text_label_->SetText(l10n_util::GetStringFUTF16(
         IDS_ASH_LOGOUT_CONFIRMATION_WARNING,
-        ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromSeconds(
-            seconds_remaining))));
+        ui::TimeFormat::Simple(
+            ui::TimeFormat::kDuration, ui::TimeFormat::kLong,
+            base::TimeDelta::FromSeconds(seconds_remaining))));
   } else {
     text_label_->SetText(l10n_util::GetStringUTF16(
         IDS_ASH_LOGOUT_CONFIRMATION_WARNING_NOW));