[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/android/BUILD.gn

Index: services/device/battery/android/BUILD.gn
diff --git a/device/battery/android/BUILD.gn b/services/device/battery/android/BUILD.gn
similarity index 88%
rename from device/battery/android/BUILD.gn
rename to services/device/battery/android/BUILD.gn
index fa22d0677c098b4e7f1e5d2aa1dcca7b4fd2324e..86aed8ea884ba2e67fd79bc0a8b6375c4f3835d1 100644
--- a/device/battery/android/BUILD.gn
+++ b/services/device/battery/android/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 
 android_library("battery_monitor_java") {
+  visibility = [ "//services/device:*" ]
   java_files = [
     "java/src/org/chromium/device/battery/BatteryStatusManager.java",
     "java/src/org/chromium/device/battery/BatteryMonitorImpl.java",
@@ -14,9 +15,9 @@ android_library("battery_monitor_java") {
 
   deps = [
     "//base:base_java",
-    "//device/battery:mojo_bindings_java",
     "//mojo/public/java:bindings_java",
     "//mojo/public/java:system_java",
+    "//services/device/public/interfaces:interfaces_java",
     "//services/service_manager/public/java:service_manager_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]