[DeviceService] Cleanup of android library dependencies.

services/device/BUILD.gn

Index: services/device/BUILD.gn
diff --git a/services/device/BUILD.gn b/services/device/BUILD.gn
index b6c558ee911a01c37a00d33859049b56683f9174..dd292666a74b978d5e31eea9d75d5a2a959f3825 100644
--- a/services/device/BUILD.gn
+++ b/services/device/BUILD.gn
@@ -11,6 +11,9 @@ if (is_android) {
 }
 
 source_set("lib") {
+  # This should be visible only to embedders of the Device Service, and the
+  # dependence should only be for the purpose of embedding the Device Service.
+  visibility = [ "//content/browser" ]
   sources = [
     "device_service.cc",
     "device_service.h",
@@ -85,11 +88,13 @@ if (is_android) {
   }
 
   android_library("java") {
-    java_files = [
-      "android/java/src/org/chromium/services/device/InterfaceRegistrar.java",
-      "screen_orientation/android/java/src/org/chromium/device/screen_orientation/ScreenOrientationListener.java",
-      "time_zone_monitor/android/java/src/org/chromium/device/time_zone_monitor/TimeZoneMonitor.java",
-    ]
+    # This should be visible only to embedders of the Device Service, and the
+    # dependence should only be for the purpose of embedding the Device Service.
+    # //content/public/android:* here actually wants to identify the
+    # //content/public/android:content_java target and all of its generated
+    # targets which also need to see this target as well.
+    visibility = [ "//content/public/android:*" ]
+    java_files = [ "android/java/src/org/chromium/services/device/InterfaceRegistrar.java" ]
     deps = [
       "//base:base_java",
       "//device/battery:mojo_bindings_java",
@@ -99,9 +104,10 @@ if (is_android) {
       "//mojo/android:system_java",
       "//mojo/public/java:bindings_java",
       "//mojo/public/java:system_java",
+      "//services/device/screen_orientation:java",
+      "//services/device/time_zone_monitor:java",
       "//services/service_manager/public/interfaces:interfaces_java",
       "//services/service_manager/public/java:service_manager_java",
-      "//ui/android:ui_java",
     ]
   }
 }