Merge "Do not always trigger CarrierConfig change in GsmCdmaPhone"