Add device-specific support for GoogleBattery AIDL V1

Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: I7e4b64a85619e4fafdde82b2a8a21241e46afc10
Merged-In: I7e4b64a85619e4fafdde82b2a8a21241e46afc10
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index a0072b4..9b307e1 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -90,9 +90,9 @@
              <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
+    <hal format="aidl" optional="false">
         <name>vendor.google.google_battery</name>
-        <version>1.2</version>
+        <version>1</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>
diff --git a/manifest.xml b/manifest.xml
index c7c1413..f757874 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -83,14 +83,13 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-      <name>vendor.google.google_battery</name>
-      <transport>hwbinder</transport>
-      <version>1.2</version>
-      <interface>
-        <name>IGoogleBattery</name>
-        <instance>default</instance>
-      </interface>
+    <hal format="aidl">
+        <name>vendor.google.google_battery</name>
+        <version>1</version>
+        <interface>
+            <name>IGoogleBattery</name>
+            <instance>default</instance>
+        </interface>
     </hal>
     <hal format="hidl">
         <name>vendor.google.radioext</name>