Reland of Android: support multiple displays on C++ side

ui/display/screen.cc

 // Copyright 2012 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.
 
 #include "ui/display/screen.h"
 
 #include "ui/display/display.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace display {
 
 namespace {
 
 Screen* g_screen;
 
 }  // namespace
 
 Screen::Screen() {}
 
 Screen::~Screen() {}
 
 // static
 Screen* Screen::GetScreen() {
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(OS_MACOSX)
   // TODO(scottmg): https://crbug.com/558054
   if (!g_screen)
     g_screen = CreateNativeScreen();
 #endif
   return g_screen;
 }
 
 // static
 void Screen::SetScreenInstance(Screen* instance) {
   g_screen = instance;
@@ skipping 16 matching lines @@
   for (const display::Display& display_in_list : GetAllDisplays()) {
     if (display_in_list.id() == display_id) {
       *display = display_in_list;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace display