diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..51503631100de567d1a13be1440fa64550304a6f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+stages:
+  - auto-merge-main
+  - update-from-upstream
+
+include:
+  - project: 'e/templates'
+    ref: master
+    file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml'
+  - project: 'e/templates'
+    ref: master
+    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
diff --git a/src/java/com/android/internal/telephony/SmsDispatchersController.java b/src/java/com/android/internal/telephony/SmsDispatchersController.java
index 53556ac9f7246da70c6ceaaffd7d0d86f3856311..a6a4edd6fa9092d4ddeb6f80aa8069a2791c80b5 100644
--- a/src/java/com/android/internal/telephony/SmsDispatchersController.java
+++ b/src/java/com/android/internal/telephony/SmsDispatchersController.java
@@ -37,6 +37,7 @@ import android.provider.Telephony.Sms.Intents;
 import android.telephony.ServiceState;
 import android.telephony.SmsManager;
 import android.telephony.SmsMessage;
+import android.telephony.TelephonyManager;
 
 import com.android.ims.ImsManager;
 import com.android.internal.annotations.VisibleForTesting;
@@ -103,6 +104,8 @@ public class SmsDispatchersController extends Handler {
     private final CommandsInterface mCi;
     private final Context mContext;
 
+    private TelephonyManager mTelephonyManager;
+
     /** true if IMS is registered and sms is supported, false otherwise.*/
     private boolean mIms = false;
     private String mImsSmsFormat = SmsConstants.FORMAT_UNKNOWN;
@@ -367,9 +370,21 @@ public class SmsDispatchersController extends Handler {
         }
     }
 
+
     private void updateImsInfo(AsyncResult ar) {
         int[] responseArray = (int[]) ar.result;
-        setImsSmsFormat(responseArray[1]);
+        int mcc, mnc;
+
+        mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+
+        String carrierMccMnc = mTelephonyManager.getNetworkOperator();
+
+        if ("20820".equals(carrierMccMnc)) { // Check if MCC is 208 and MNC is 20 (Bouygues)
+            setImsSmsFormat(PhoneConstants.PHONE_TYPE_GSM); // Sets 3GPP format
+        } else {
+            setImsSmsFormat(responseArray[1]);
+        }
+
         mIms = responseArray[0] == 1 && !SmsConstants.FORMAT_UNKNOWN.equals(mImsSmsFormat);
         Rlog.d(TAG, "IMS registration state: " + mIms + " format: " + mImsSmsFormat);
     }