cros: Propagate device type to the "managed by" notice

Notice at the bottom on the Login/Lock screen

Fixed: 1045160
Change-Id: Ib274fd7084dcd80f65cd8051ee360cd359850d5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019208Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735036}

ash/ash_strings.grd

@@ -1737,7 +1737,7 @@ This file contains the strings for ash.
         Delete
       </message>
       <message name="IDS_ASH_LOGIN_MANAGED_DEVICE_INDICATOR" desc="Template for text shown as a bottom status on the login screen, informing the user that this device is managed.">
-        Device managed by <ph name="DOMAIN">$1<ex>yourdomain.com</ex></ph>
+        <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> managed by <ph name="DOMAIN">$2<ex>yourdomain.com</ex></ph>
       </message>
       <message name="IDS_ASH_LOGIN_POD_OWNER_USER" desc="Login/lock screen user pod menu title for a user who owns the device.">
         <ph name="USER_NAME">$1<ex>Ivan Arbuzov</ex></ph> (owner)

ash/ash_strings_grd/IDS_ASH_LOGIN_MANAGED_DEVICE_INDICATOR.png.sha1

-861526082f2054c3b7f7936cd94919c9db9a8bb7
+c65621e3e10bd49f7ac4356d7c3dc5763d542be8
\ No newline at end of file

ash/login/ui/lock_contents_view.cc

@@ -56,6 +56,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/base/user_activity/user_activity_observer.h"
+#include "ui/chromeos/devicetype_utils.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
@@ -616,6 +617,7 @@ void LockContentsView::ShowEntrepriseDomainName(
       AshColorProvider::ContentLayerType::kIconPrimary);
   bottom_status_indicator_->SetText(
       l10n_util::GetStringFUTF16(IDS_ASH_LOGIN_MANAGED_DEVICE_INDICATOR,
+                                 ui::GetChromeOSDeviceName(),
                                  base::UTF8ToUTF16(entreprise_domain_name)),
       gfx::kGoogleGrey200);
   bottom_status_indicator_->SetVisible(true);