Merge "Prevent SIM selection and change SIM from showing when there are active calls" am: e9641f8664
am: 373105604c

Change-Id: Icf1134fae6c1bcbb81f932658f81a9d3bdd9b05a