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

ash/system/session_length_limit/tray_session_length_limit.cc

Index: ash/system/session_length_limit/tray_session_length_limit.cc
diff --git a/ash/system/session_length_limit/tray_session_length_limit.cc b/ash/system/session_length_limit/tray_session_length_limit.cc
index 3d8009635870533a5b04e85bc8c32c6b059abc69..d55e9e6ff4ecac4f97e47e1f756e5e4d35a5737d 100644
--- a/ash/system/session_length_limit/tray_session_length_limit.cc
+++ b/ash/system/session_length_limit/tray_session_length_limit.cc
@@ -71,7 +71,9 @@ base::string16 FormatRemainingSessionTimeNotification(
     const base::TimeDelta& remaining_session_time) {
   return l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_REMAINING_SESSION_TIME_NOTIFICATION,
-      ui::TimeFormat::TimeDurationLong(remaining_session_time));
+      ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_DURATION,
+                             ui::TimeFormat::LENGTH_LONG,
+                             remaining_session_time));
 }
 
 // Creates, or updates the notification for session length timeout with