Merge "Add telephony API to switch multi sim config" am: 602df1aa8c
am: 9fef7be245

Change-Id: Iad4a48b5117b11f63f3d086b42f879034fd415e3