Merge "[automerger skipped] Merge "Add telephony API to switch multi sim config" am: 602df1aa8c am: 9fef7be245 am: 4101af509b -s ours am skip reason: change_id Idace8ed7f3fe78a6ce831225bda499a58a34c80f with SHA1 1e031bde1a is in history"