Merge cherrypicks of ['googleplex-android-review.googlesource.com/30519231'] into 25D4-release.

Change-Id: Ia76ce5c2fa28f0c0ff1db1d83b278f2d82ffd5a1

location/gps.cfg

@@ -37,7 +37,8 @@ Is1PPSTimeSyncEnable=1
 Chip_Configuration_Dynamic_HSI=0
 
 # Set UBSAN to operate on logging mode on FW
-Chip_Configuration_ubsan_opt=1
+# 0: disable 1: crash mode 2: logging mode
+Chip_Configuration_ubsan_opt=2
 
 # borrow this field to force CP crash on GAL bad ISM
 #Chip_Configuration_WT1=1
@@ -199,18 +200,6 @@ RfPathLossDb_Ap=3800
 RfPathLossDb_Cp=3800
 NmeaBitmask=0x010003fff
 
-# GNSS power values in "mW"
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
-
 # force engine to use entire response time for emergency session; default 0
 IsUseEntireRespTime911=1
 # force engine to engage high accuracy if entire response time used; default 0

location/gps_user.cfg

@@ -13,7 +13,7 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin
 ChipCfg_Timemark_Option=1
 Is1PPSTimeSyncEnable=1
 Chip_Configuration_Dynamic_HSI=0
-Chip_Configuration_ubsan_opt=1
+Chip_Configuration_ubsan_opt=2
 GlueLayer_IsPlatformRefTimeEnable=1
 chpp_betp_client=1
 chpp_log_level=0
@@ -76,16 +76,6 @@ SpotLogger_Allowed=0
 RfPathLossDb_Ap=3800
 RfPathLossDb_Cp=3800
 NmeaBitmask=0x010003fff
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
 IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 isUseUncalAccel=1