[automerger skipped] Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported" am: 74ad1b81ab am: 54e73b6e1a am: 4099874d5c
am: 450c72984b -s ours
am skip reason: change_id I875e597fa3cb5d7f5a93989d2ff8e4abbbd9d045 with SHA1 c8a345a885 is in history

Change-Id: I5d23a67d5fee71ba1f4d3723fd67ac0ea3f6957c