Merge commit '328aa404d9d4b2445db45916739c521fd6967dac' into manual_merge_328aa40

Test: Build
Change-Id: I4c3a92a417cc34604e6f5dade4d621750b5aba71

diff --cc include/telephony/ril.h
index eeaea49,c6ecf4b..8d7febc
--- 1/include/telephony/ril.h
--- 2/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@@ -2938,7 -2904,7 +2941,7 @@@ typedef struct 
   *  Other errors could include:
   *    RADIO_NOT_AVAILABLE, OP_NOT_ALLOWED_BEFORE_REG_TO_NW,
   *    OP_NOT_ALLOWED_DURING_VOICE_CALL and REQUEST_NOT_SUPPORTED,
-  *    INVALID_ARGUMENTS
 - *    SIM_ABSENT
++ *    INVALID_ARGUMENTS, SIM_ABSENT
   *
   * See also: RIL_REQUEST_DEACTIVATE_DATA_CALL
   */
@@@ -3315,10 -3269,7 +3318,11 @@@
   * Valid errors:
   *  SUCCESS
   *  RADIO_NOT_AVAILABLE
 + *  INVALID_CALL_ID
 + *  INVALID_STATE
 + *  INVALID_ARGUMENTS
 + *  REQUEST_NOT_SUPPORTED
+  *  SIM_ABSENT
   *
   * See also: RIL_REQUEST_SETUP_DATA_CALL
   */
@@@ -5519,8 -5317,7 +5531,9 @@@
   * SUCCESS
   * RADIO_NOT_AVAILABLE
   * LCE_NOT_SUPPORTED
 + * INTERNAL_ERR
 + * REQUEST_NOT_SUPPORTED
+  * SIM_ABSENT
   */
  #define RIL_REQUEST_START_LCE 132