[Feature][Modem]1.merge MTK P2 patch 2.RF:bias modification of frequency band

Change-Id: I846de8f085e50c1b9557ad8c5d0b2cc088b18d86
diff --git a/mcu/interface/sap/md_sap.h b/mcu/interface/sap/md_sap.h
index 43d8b32..5617c67 100755
--- a/mcu/interface/sap/md_sap.h
+++ b/mcu/interface/sap/md_sap.h
@@ -322,8 +322,8 @@
     NMAC_NL1_SAP,
     NMAC_NL1_SLIM_SAP,
     EL1_NL1_SAP,
-    EL1MPC_NL1_SAP,  // __EL1_LPP_INTER_RAT_RSTD_SUPPORT_- 
-    NL1_EL1MPC_SAP,  // __EL1_LPP_INTER_RAT_RSTD_SUPPORT_ 
+    EL1MPC_NL1_SAP,  // __EL1_LPP_INTER_RAT_RSTD_SUPPORT_-
+    NL1_EL1MPC_SAP,  // __EL1_LPP_INTER_RAT_RSTD_SUPPORT_
     NL1_MMRF_XL1TST_SAP,
     NL1_NL1_SAP,
     NL1_NL1ICD_SAP,
@@ -1081,8 +1081,8 @@
     D2_SAP,
 
     /* D2PM */
-    ME_D2PM_SAP, 
-    D2PM_D2APN_SAP, 
+    ME_D2PM_SAP,
+    D2PM_D2APN_SAP,
     D2PM_D2RM_SAP,
     D2PM_DDM_SAP,
 
@@ -1090,12 +1090,12 @@
     D2APN_D2CUST_SAP,
 
     /* URSP */
-    D2APN_URSP_SAP, 
-    D2PM_URSP_SAP, 
-    D2RM_URSP_SAP, 
-    DDM_URSP_SAP, 
-    URSP_UPDS_SAP, 
-    URSP_VGMM_SAP, 
+    D2APN_URSP_SAP,
+    D2PM_URSP_SAP,
+    D2RM_URSP_SAP,
+    DDM_URSP_SAP,
+    URSP_UPDS_SAP,
+    URSP_VGMM_SAP,
 
     /* D2SSC */
     D2SSC_D2_SAP,
@@ -1335,7 +1335,7 @@
     VGSM_RATDM_SAP,
     ESM_VGSM_SAP,
     L4C_VGSM_SAP,
-    
+
     DHL_MRS_SAP,
     DHL_GMSS_SAP,
 
@@ -1349,6 +1349,7 @@
     /* UPDS SAP */
     URSP_SAP,
     UPDS_VGMM_SAP,
+    L4C_UPDS_SAP,
 
     /* D2AT */
     D2AT_D2RM_SAP,
@@ -1491,7 +1492,7 @@
 
     /* N3CF */
     N3CF_L4C_SAP,
-    
+
     /* N3SAM */
     N3SAM_N3SAM_SAP,
     N3EPC_N3SAM_SAP,
@@ -1507,7 +1508,7 @@
     N3EPC_N3ANS_SAP,
     N3ANS_SIMMNGR_SAP,
     N3ANS_L4BNW_SAP,
-    
+
     /* N3SYS */
     N3SYS_SAP,
 
@@ -1522,21 +1523,21 @@
     IMCSMS_EVAL_SAP,
     SMS_IMCSMS_SAP,
 	DHL_SMS_SAP,
-	
+
     ERRC_MT_SAP,
     IMS_UA_USER_SENSITIVE_SAP,
-	
+
 	XCAP_IMC_SAP,
 	SASE_IMC_SAP,
     SMU_CVAL_SAP,
     L4BPWR_MT_SAP,
 
 	CC_GAS_SAP,
-	
+
 	MT_USER_SENSITIVE_SAP,
-	
+
     SBP_CSS_SAP,
-    
+
     /* SASE to ERRC */
     SASE_ERRC_SAP,
     /* SASE to NRRC */
@@ -1555,7 +1556,7 @@
 	ATP_SASE_SAP,
 	SASE_SAP,
 	IMSM_MSPM_SAP,
-	
+
     /*OSTD SAP*/
     OSTD_SAP,
 
@@ -1570,7 +1571,7 @@
 
 #ifdef __IPC_ADAPTER__
 /* IPC Adapter */
-    IPCA_ATP_SAP, 
+    IPCA_ATP_SAP,
     IPCA_PWR_SAP,
     IPCA_SMS_SAP,
     IPCA_SAT_SAP,
@@ -1590,7 +1591,7 @@
     IPCA_EM_SAP,
     IPCA_FACTORY_SAP,
     IPCA_IMS_SAP,
-    IPCA_CFG_SAP,    
+    IPCA_CFG_SAP,
     IPCA_NW_GPRS_SAP,
     IPCA_GPRS_ROUTINE_SAP,
     IPCA_LEISIM_SAP,
@@ -1605,15 +1606,15 @@
     L4BSIM_IPCA_SRLTE_SAP,
 
     DHL_IPCA_SMU_SAP,
-    IPCA_SBP_SAP,    
+    IPCA_SBP_SAP,
     IPCA_UPCM_SAP,
     IPCA_DOMESTIC_SAP,
     IPCA_SMU_SIM_SAP,
-    
+
 #endif
     D2AT_IPCA_GPRS_SAP,
 
-    /* L5*/    
+    /* L5*/
     L5IO_SAP,
     L5IO_L5U_SAP,
     L5IO_USWITCH_SAP,
@@ -1641,7 +1642,7 @@
     L5U_SAP,
 
     L5UNW_L4BNW_SAP,
-    L5USS_L5USS_SAP,	
+    L5USS_L5USS_SAP,
 	L5IO_L5USYS_SAP,
 	L5UPDN_D2CM_SAP,
     L5UPDN_D2_SAP,
@@ -1651,7 +1652,9 @@
     L5UNW_L4C_SAP,
 	L5URF_L4C_SAP,
     NL1_MT_SAP,
+    NRRC_MT_SAP,
     DHL_VDM_SAP,
+    DHL_PHB_SAP,
 
     L5IO_SLT_SAP,
     L5USIM_L5USWITCH_SAP,