Merge "Add telephony API to switch multi sim config" am: 416e09ea27
am: 79d604f77e

Change-Id: Ib4015254390b4d2f138c970f028f4f3b7194aa99