Merge "Move fuelgauge_usage_state.proto into fuelgauge folder."

protos/Android.bp

@@ -41,11 +41,3 @@ java_library {
     },
     srcs: ["fuelgauge_log.proto"],
 }
-
-java_library {
-    name: "fuelgauge-usage-state-protos-lite",
-    proto: {
-        type: "lite",
-    },
-    srcs: ["fuelgauge_usage_state.proto"],
-}

src/com/android/settings/fuelgauge/protos/Android.bp

@@ -0,0 +1,16 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
+java_library {
+    name: "fuelgauge-usage-state-protos-lite",
+    proto: {
+        type: "lite",
+    },
+    srcs: ["fuelgauge_usage_state.proto"],
+}

src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto

@@ -1,6 +1,5 @@
 syntax = "proto2";
 
-package com.android.settings.intelligence;
 option java_multiple_files = true;
 option java_package = "com.android.settings.fuelgauge.batteryusage";
 option java_outer_classname = "FuelgaugeUsageStateProto";