[automerge] Revert "gps: update gps driver 140.20.23.532343" 2p: 87a5d658a1

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

Change-Id: I6968900c0c3e797e2bfd44e9c342555cb56d8cff

gnss/47765/Android.bp

@@ -42,7 +42,7 @@ cc_prebuilt_library_shared {
                 "android.hardware.gnss@2.1",
                 "android.hardware.gnss.measurement_corrections@1.0",
                 "android.hardware.gnss.visibility_control@1.0",
-                "android.hardware.gnss-V2-ndk",
+                "android.hardware.gnss-V1-ndk",
                 "libhardware",
                 "libc++",
                 "libc",
@@ -77,7 +77,6 @@ cc_prebuilt_binary {
                 "android.hardware.gnss@1.1",
                 "android.hardware.gnss@2.0",
                 "android.hardware.gnss@2.1",
-                "android.hardware.gnss-V2-ndk",
                 "libc++",
                 "libc",
                 "libm",

gnss/47765/android.hardware.gnss@2.1-service-brcm.xml

@@ -1,7 +1,16 @@
 <manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.gnss</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <version>1.1</version>
+        <interface>
+            <name>IGnss</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl">
         <name>android.hardware.gnss</name>
-        <version>2</version>
         <fqname>IGnss/default</fqname>
     </hal>
 </manifest>