Small bug fixes for multi-display support for Android.

Ensure both displays are on before allowing multi-display.

BUG=824954

Change-Id: If235135d3dfbfa6c42f31bd30c0a3deba145f33f
Reviewed-on: https://chromium-review.googlesource.com/1162912Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580893}

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

@@ -672,7 +672,8 @@ public class ChromeTabbedActivity
         }
 
         if (FeatureUtilities.isTabModelMergingEnabled()) {
-            boolean inMultiWindowMode = MultiWindowUtils.getInstance().isInMultiWindowMode(this);
+            boolean inMultiWindowMode = MultiWindowUtils.getInstance().isInMultiWindowMode(this)
+                    || MultiWindowUtils.getInstance().isInMultiDisplayMode(this);
             // Don't need to merge tabs when mMergeTabsOnResume is null (cold start) since they get
             // merged when TabPersistentStore.loadState(boolean) is called from initializeState().
             if (!inMultiWindowMode && (mMergeTabsOnResume != null && mMergeTabsOnResume)) {

chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java

@@ -85,7 +85,9 @@ public class MultiWindowUtils implements ActivityStateListener {
         DisplayManager displayManager =
                 (DisplayManager) activity.getSystemService(Context.DISPLAY_SERVICE);
         Display[] displays = displayManager.getDisplays();
-        return displays != null && displays.length == 2;
+        if (displays == null || displays.length != 2) return false;
+        return displays[0].getState() == Display.STATE_ON
+                && displays[1].getState() == Display.STATE_ON;
     }
 
     @VisibleForTesting