Revert "Fix startup grey status bar on < M devices"

This reverts commit 27d290e8.

Reason for revert: Breaks tests: https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Marshmallow%2064%20bit%20Tester/23892

Original change's description:
> Fix startup grey status bar on < M devices
> 
> This patch moves the white status bar theme to a version specific
> v23 directory to prevent L and below devices from using the flashing
> between colors. Logic has also been added to ChromeActivity to prevent
> these devices from using the grey (darkened version of white) color on
> startup.
> 
> Bug: 881239
> Change-Id: I41e5d959fab96623d254f4ff2dd0ea15cb6f9abc
> Reviewed-on: https://chromium-review.googlesource.com/1228496
> Commit-Queue: Matthew Jones <mdjones@chromium.org>
> Reviewed-by: Theresa <twellington@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#591857}

TBR=twellington@chromium.org,mdjones@chromium.org

Change-Id: Idbd15b881ffe2652aaea6a0a86faf02872256337
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 881239
Reviewed-on: https://chromium-review.googlesource.com/1230697Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592042}

chrome/android/java/res/values-v17/styles.xml

@@ -54,10 +54,12 @@
     </style>
 
     <style name="TabbedModeThemeBase" parent="MainTheme">
-        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:statusBarColor" tools:targetApi="21">@color/modern_primary_color</item>
     </style>
 
-    <style name="TabbedModeTheme" parent="TabbedModeThemeBase" />
+    <style name="TabbedModeTheme" parent="TabbedModeThemeBase">
+        <item name="android:windowBackground">@android:color/white</item>
+    </style>
 
     <style name="FirstRunTheme" parent="DialogWhenLarge">
     </style>

chrome/android/java/res/values-v23/styles.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2018 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file. -->
-
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="TabbedModeTheme" parent="TabbedModeThemeBase">
-        <item name="android:statusBarColor">@color/modern_primary_color</item>
-    </style>
-</resources>
-

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -558,7 +558,10 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
     protected void onInitialLayoutInflationComplete() {
         mInflateInitialLayoutEndMs = SystemClock.elapsedRealtime();
         // Set the status bar color to white by default.
-        setStatusBarColor(ColorUtils.getDefaultThemeColor(getResources(), false), true);
+        setStatusBarColor(null,
+                DeviceFormFactor.isNonMultiDisplayContextOnTablet(this)
+                        ? Color.BLACK
+                        : ColorUtils.getDefaultThemeColor(getResources(), false));
 
         ViewGroup rootView = (ViewGroup) getWindow().getDecorView().getRootView();
         mCompositorViewHolder = (CompositorViewHolder) findViewById(R.id.compositor_view_holder);