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

ui/display/BUILD.gn

Index: ui/display/BUILD.gn
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index 6ecdbc6d9658f9744156cfef9734701a2e877800..e5eed0640618b09b9fbe9d7c3f6be2fcc4542e8f 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -7,7 +7,8 @@ import("//testing/test.gni")
 
 component("display") {
   sources = [
-    "android/screen_android.cc",
+    "android/display_android_manager.cc",
+    "android/display_android_manager.h",
     "chromeos/apply_content_protection_task.cc",
     "chromeos/apply_content_protection_task.h",
     "chromeos/configure_displays_task.cc",
@@ -86,6 +87,10 @@ component("display") {
     "//ui/gfx/geometry",
   ]
 
+  if (is_android) {
+    deps += [ "//ui//android:ui_android_jni_headers" ]
+  }
+
   if (is_chromeos && use_x11) {
     sources += [
       "chromeos/x11/display_mode_x11.cc",
@@ -117,9 +122,7 @@ component("display") {
   if (!use_aura) {
     sources -= [ "screen_aura.cc" ]
   }
-  if (is_android && use_aura) {
-    sources -= [ "android/screen_android.cc" ]
-  }
+
   if (is_mac) {
     libs = [
       "AppKit.framework",