[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: bbf8425a8c -s ours

am skip reason: skipped by user delphij

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

Change-Id: If941a99d098436c8f49385682826256332c54016
diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
index d7b62fa..5bfd5a7 100644
--- a/audio/sound_trigger_mixer_paths.xml
+++ b/audio/sound_trigger_mixer_paths.xml
@@ -91,9 +91,9 @@
     <ctl name="EC Reference SampleRate" value="0"/>
     <ctl name="PRI_TDM_TX_0 LSM Function" value="None" />
     <ctl name="PRI_TDM_TX_0 Channels" value="One" />
-    <ctl name="Sto1 ADC MIXL DMIC Switch" value="0" />
-    <ctl name="Sto2 ADC MIXL DMIC Switch" value="0" />
-    <ctl name="Sto2 ADC MIXR DMIC Switch" value="0" />
+    <ctl name="Sto1 ADC MIXL BargeIn DMIC Switch" value="0" />
+    <ctl name="Sto2 ADC MIXL BargeIn DMIC Switch" value="0" />
+    <ctl name="Sto2 ADC MIXR BargeIn DMIC Switch" value="0" />
 
     <path name="listen-voice-wakeup-1">
         <ctl name="PRI_TDM_TX_0 LSM Function" value="AUDIO" />
@@ -259,15 +259,15 @@
         <ctl name="ADC1 Capture Volume" value="23" />
         <ctl name="ADC2 Capture Volume" value="23" />
         <ctl name="PRI_TDM_TX_0 Channels" value="One" />
-        <ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
+        <ctl name="Sto1 ADC MIXL BargeIn DMIC Switch" value="1" />
     </path>
 
     <path name="listen-ape-handset-dmic">
         <ctl name="ADC1 Capture Volume" value="23"/>
         <ctl name="ADC2 Capture Volume" value="23"/>
         <ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
-        <ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
-        <ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
+        <ctl name="Sto1 ADC MIXL BargeIn DMIC Switch" value="1" />
+        <ctl name="Sto2 ADC MIXL BargeIn DMIC Switch" value="1" />
     </path>
 
     <path name="listen-ape-handset-tmic">
diff --git a/device-bramble.mk b/device-bramble.mk
index 7069eb6..cf1d8ce 100644
--- a/device-bramble.mk
+++ b/device-bramble.mk
@@ -18,15 +18,15 @@
 
 ifeq ($(TARGET_PREBUILT_KERNEL),)
     ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-        LOCAL_KERNEL := device/google/bramble-kernel/Image.lz4
+        LOCAL_KERNEL := device/google/redbull-kernel/Image.lz4
     else
-        LOCAL_KERNEL := device/google/bramble-kernel/vintf/Image.lz4
+        LOCAL_KERNEL := device/google/redbull-kernel/vintf/Image.lz4
     endif
 else
     LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 endif
 
-PRODUCT_VENDOR_KERNEL_HEADERS := device/google/bramble-kernel/sm7250/kernel-headers
+PRODUCT_VENDOR_KERNEL_HEADERS := device/google/redbull-kernel/sm7250/kernel-headers
 
 include build/make/target/product/iorap_large_memory_config.mk
 include device/google/redbull/device-common.mk
@@ -196,4 +196,4 @@
     SettingsOverlayG025E
 
 # Keyboard bottom padding in dp for portrait mode
-PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10
\ No newline at end of file
+PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10
diff --git a/gnss_antenna_info.conf b/gnss_antenna_info.conf
index 2b5ba03..79a2aef 100644
--- a/gnss_antenna_info.conf
+++ b/gnss_antenna_info.conf
@@ -71,6 +71,14 @@
 # SIGNAL_GAIN_CORRECTION_UNC
 #   2D vectors of 1-sigma uncertainty in dBi associated with the signal
 #   gain correction values.
+#
+# The number of rows and columns could be the same for PC variation correction
+# and signal gain corrections, or could be different
+# If the former then NUMBER_OF_ROWS_ and NUMBER_OF_COLUMNS_ are specified once
+# only, if the latter then NUMBER_OF_ROWS_ and NUMBER_OF_COLUMNS_ represent
+# the number of rows/columns for PC variation correction and
+# NUMBER_OF_ROWS_SGC_ and NUMBER_OF_COLUMNS_SGC_ represent the number of
+# rows/columns for signal gain corrections
 
 ANTENNA_INFO_VECTOR_SIZE = 2
 
@@ -104,6 +112,8 @@
 
 NUMBER_OF_ROWS_1 = 4
 NUMBER_OF_COLUMNS_1 = 2
+NUMBER_OF_ROWS_SGC_1 = 3
+NUMBER_OF_COLUMNS_SGC_1 = 4
 
 PC_VARIATION_CORRECTION_1_ROW_0 = 55.66 77.88
 PC_VARIATION_CORRECTION_1_ROW_1 = 11.22 33.44
@@ -115,12 +125,10 @@
 PC_VARIATION_CORRECTION_UNC_1_ROW_2 = 2.1 2.2
 PC_VARIATION_CORRECTION_UNC_1_ROW_3 = 0.1 0.2
 
-SIGNAL_GAIN_CORRECTION_1_ROW_0 = 7.6 6.5
-SIGNAL_GAIN_CORRECTION_1_ROW_1 = 5.4 4.3
-SIGNAL_GAIN_CORRECTION_1_ROW_2 = 1.3 2.4
-SIGNAL_GAIN_CORRECTION_1_ROW_3 = 9.8 8.7
+SIGNAL_GAIN_CORRECTION_1_ROW_0 = 7.6 6.5 5.4 4.3
+SIGNAL_GAIN_CORRECTION_1_ROW_1 = 1.3 2.4 9.8 8.7
+SIGNAL_GAIN_CORRECTION_1_ROW_2 = 1.4 2.5 3.6 4.7
 
-SIGNAL_GAIN_CORRECTION_UNC_1_ROW_0 = 0.91 0.92
-SIGNAL_GAIN_CORRECTION_UNC_1_ROW_1 = 0.55 0.66
-SIGNAL_GAIN_CORRECTION_UNC_1_ROW_2 = 0.11 0.22
-SIGNAL_GAIN_CORRECTION_UNC_1_ROW_3 = 0.93 0.94
+SIGNAL_GAIN_CORRECTION_UNC_1_ROW_0 = 0.91 0.92 0.55 0.66
+SIGNAL_GAIN_CORRECTION_UNC_1_ROW_1 = 0.11 0.22 0.93 0.94
+SIGNAL_GAIN_CORRECTION_UNC_1_ROW_2 = 0.95 0.96 0.33 0.44