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

Change-Id: I5192d599c906070c76eeae7bbaa5e5ab3a80b960