Merge "Improve carrierconfig to support multisim in GsmCdmaPhone"