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

Change-Id: I590d69e9ca8077bf427f877e2bc934e70d39bf18
diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index e408e17..35eed54 100644
--- a/location/gnssd/release/android.hardware.gnss-service
+++ b/location/gnssd/release/android.hardware.gnss-service
Binary files differ
diff --git a/location/gnssd/release/build.properties b/location/gnssd/release/build.properties
index 3167c2a..d9e713e 100644
--- a/location/gnssd/release/build.properties
+++ b/location/gnssd/release/build.properties
@@ -1,7 +1,7 @@
-BUILD_TIMESTAMP_UTC=2024-04-18 01:11:46.484924
-USER_COMMIT=19011f36bde8ec7bf0f7f60d906e4a019b4e6e43
-GNSS_SW_VER_BRANCH=R4.13
-GNSS_SW_VER_STRING=4.13.2_8_Release_216074
+BUILD_TIMESTAMP_UTC=2024-12-02 20:55:44.202302
+USER_COMMIT=b6b33124ee635ea551601e3d5fb9bd0958c2bb21
 BASE_COMMIT=f40f31115750f412c4860692772ef6b0b4141105
+GNSS_SW_VER_BRANCH=R4.13
+GNSS_SW_VER_STRING=4.13.2_28_Release_248164
 WORD_SIZE=arm64
 ANDROID_VERSION=34
diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd
index e1da79b..1c88321 100644
--- a/location/gnssd/release/gnssd
+++ b/location/gnssd/release/gnssd
Binary files differ
diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index 6727d40..2a3bbcf 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -220,6 +220,8 @@
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
 CP_LOCTECH_CONSTRAINTS=5
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index 70271b0..7366ef2 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -102,6 +102,8 @@
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 GNSS_CARRIER_ID=1
 CP_LOCTECH_CONSTRAINTS=5
 GNSS_CARRIER_ID=2
diff --git a/location/gnssd/release/kepler.bin b/location/gnssd/release/kepler.bin
index 1e94029..77f7ab4 100644
--- a/location/gnssd/release/kepler.bin
+++ b/location/gnssd/release/kepler.bin
Binary files differ