Add device-specific support for GoogleBattery AIDL V1 am: d543694a05

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/19330369

Change-Id: Ifa9089d0bb8bb51bb3503d3a455f9d00a74be175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/vf/device_framework_matrix_product.R.5.xml b/vf/device_framework_matrix_product.R.5.xml
index 2d7ba29..a00e40c 100644
--- a/vf/device_framework_matrix_product.R.5.xml
+++ b/vf/device_framework_matrix_product.R.5.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.1-2</version>
+        <version>1</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>
diff --git a/vf/device_framework_matrix_product.S.5.xml b/vf/device_framework_matrix_product.S.5.xml
index ca45b30..04114ed 100644
--- a/vf/device_framework_matrix_product.S.5.xml
+++ b/vf/device_framework_matrix_product.S.5.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.1-2</version>
+        <version>1</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>