Merge "Improve carrierconfig to support multisim in GsmCdmaPhone"
am: 9f3f0bca53

Change-Id: I14ed61231a3ba96cdf20cfa14e2be5083dead58b