[Feature][Modem]Merge MTK release P3 P4 patch

Change-Id: I1ef3d69e36378ee73a422ecb2721488d6b416427
diff --git a/mcu/protocol/interface/ims/imcb_imc_struct.h b/mcu/protocol/interface/ims/imcb_imc_struct.h
index 6850014..de3258c 100755
--- a/mcu/protocol/interface/ims/imcb_imc_struct.h
+++ b/mcu/protocol/interface/ims/imcb_imc_struct.h
@@ -203,6 +203,7 @@
     IMCB_IMC_CALL_CAUSE_RETRY_IMS_VIDEO_TO_VOICE,
     IMCB_IMC_CALL_CAUSE_NO_RETRY_BAR_IMS,
 	IMCB_IMC_CALL_CAUSE_BEREJECT_380_FLIGHTMODE_CS,
+    IMCB_IMC_CALL_CAUSE_NO_RETRY_EMERGENCY,
     IMCB_IMC_CALL_CAUSE_UA_MAX,
     IMCB_IMC_CALL_CAUSE_AVAIABLE_OF_CALLS,
     IMCB_IMC_CALL_CAUSE_EMERG_REG_TIMEOUT, /* AT&T <CDR-LTE-2424>, CS domain search after emerg-reg-timer expires */
@@ -634,6 +635,7 @@
     IMCB_IMC_OPERATOR_M1            = 0x97, //151
     IMCB_IMC_OPERATOR_FIRSTNET      = 0xC4, //196
     IMCB_IMC_OPERATOR_TPG           = 0xDD, //221
+    IMCB_IMC_OPERATOR_CBN           = 0x0184, //388 
     
     /* For Any IODT Activities */
     IMCB_IMC_OPERATOR_ERICSSON_IMS_IWLAN = 0x03E9, //1001
@@ -1335,7 +1337,7 @@
     imcf_uint8   amr_nb_codec_support;
     imcf_uint8   amr_wb_codec_support;
     imcf_uint8   g_series_codec_support;
-    imcf_uint8   user_agent[128];
+    imcf_uint8   user_agent[256];
     imcf_uint8   UA_call_amr_mode_set[16];
     imcf_uint8   UA_call_amr_wb_mode_set[20];
     imcf_uint8   UA_reg_auth_name[64];
@@ -1385,6 +1387,19 @@
     imcb_imc_loc_ts_struct loc_info;
 } imcb_imc_ims_reg_ind_struct;
 
+
+/**
+ * Description
+ *  - the ILM indicate which rat UE attach
+ * Direction
+ *   IMC -> IMCB
+ */
+typedef struct {
+    LOCAL_PARA_HDR
+    imcf_uint32        currently_attached_rat; /* imc_access_rat_type_enum */
+} imcb_imc_attached_rat_ind_struct;
+
+
 /**
  * Description
  *  - the primitive is used for IMCB notifing IMC current IMS registration state,