DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: Ibb1f1cf258ce7af7b3112787b1c6eb7e355df880
Change-Id: I31d8b9174ce1e7aed13afb2e92a5c02a1c62104d

bramble/overlay/frameworks/base/core/res/res/values/config.xml

@@ -213,4 +213,12 @@
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <!-- Height of area above QQS where battery/time go (equal to status bar) -->
     <dimen name="quick_qs_offset_height">145px</dimen>
+
+    <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
+     when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
+     where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
+     and Strength as defined in Authenticators.java -->
+    <string-array name="config_biometric_sensors" translatable="false" >
+        <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
+    </string-array>
 </resources>

device-bramble.mk

@@ -161,8 +161,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 endif
 
 # GPS ANTENNA_INFO configuration file
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf
+#PRODUCT_COPY_FILES += \
+#    $(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf
 
 # Audio effects
 PRODUCT_PACKAGES += \