Revert "pregrant coarse and background location permission to scone" am: ab270a8cdc

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

Change-Id: Id484250298a757fb46a8350de703c72bb728611d
diff --git a/gnss/47765/Android.bp b/gnss/47765/Android.bp
index f4a2902..4843b23 100644
--- a/gnss/47765/Android.bp
+++ b/gnss/47765/Android.bp
@@ -42,7 +42,7 @@
                 "android.hardware.gnss@2.1",
                 "android.hardware.gnss.measurement_corrections@1.0",
                 "android.hardware.gnss.visibility_control@1.0",
-                "android.hardware.gnss-V1-ndk_platform",
+                "android.hardware.gnss-V1-ndk",
                 "libhardware",
                 "libc++",
                 "libc",
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
index b1355c8..7e58f17 100755
--- a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
+++ b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
Binary files differ
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
index 8e2b77d..46cf216 100755
--- a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
+++ b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
Binary files differ
diff --git a/usb/Android.bp b/usb/Android.bp
index 40454af..5aafe14 100644
--- a/usb/Android.bp
+++ b/usb/Android.bp
@@ -51,7 +51,7 @@
         "android.hardware.thermal@1.0",
         "android.hardware.thermal@2.0",
         "libcutils",
-        "android.frameworks.stats-V1-ndk_platform",
+        "android.frameworks.stats-V1-ndk",
         "pixelatoms-cpp",
         "libbinder_ndk",
     ],
@@ -60,7 +60,7 @@
         "libpixelstats",
     ],
     export_shared_lib_headers: [
-        "android.frameworks.stats-V1-ndk_platform",
+        "android.frameworks.stats-V1-ndk",
         "pixelatoms-cpp",
     ],
     proprietary: true,