[automerger skipped] Merge "Add telephony API to switch multi sim config" am: 416e09ea27 am: 79d604f77e
am: dddc1eaa64 -s ours
am skip reason: change_id Ic47215e78e5510a6729a0ac3cd73eb5ac93b04c5 with SHA1 628473ff46 is in history

Change-Id: I7705983282a5e0e9e056e719671729e4517f1924