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

Change-Id: I26244e6dd6534709c003189eaae66be990e8cf5c