Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.098' into pi-dev

Bug: 117810284
Change-Id: I3c1a7e8c21026ce8eab7a5d9303927fde2211a42

sdm845/gnss/GnssAdapter.cpp

diff --git a/sdm845/gnss/GnssAdapter.cpp b/sdm845/gnss/GnssAdapter.cpp
index 22832d5..e3c7efd 100644
--- a/sdm845/gnss/GnssAdapter.cpp
+++ b/sdm845/gnss/GnssAdapter.cpp
@@ -649,10 +649,13 @@
                                        ContextBase::mGps_conf.SUPL_PORT);
             mApi.setSensorControlConfig(ContextBase::mSap_conf.SENSOR_USAGE,
                                         ContextBase::mSap_conf.SENSOR_PROVIDER);
+
+            /*  Mark these LPPe functions, they are MBN configured.
             mApi.setLPPeProtocolCp(
                 mAdapter.convertLppeCp(ContextBase::mGps_conf.LPPE_CP_TECHNOLOGY));
             mApi.setLPPeProtocolUp(
                 mAdapter.convertLppeUp(ContextBase::mGps_conf.LPPE_UP_TECHNOLOGY));
+            */
 
             // set nmea mask type
             uint32_t mask = 0;