sync telephony-msim

Change-Id: I25070bf78bccfb1821fa9165a0037964d3f8994f