Merge "[automerger skipped] Merge "Add telephony API to switch multi sim...
Merge "[automerger skipped] Merge "Add telephony API to switch multi sim config" am: 602df1aa am: 9fef7be2 am: 4101af50 -s ours am skip reason: change_id Idace8ed7f3fe78a6ce831225bda499a58a34c80f with SHA1 1e031bde is in history"