Merge "Add key to CarrierConfig" am: 154c22d2d4 am: fda7370ddd
am: cf99a8e2e9

Change-Id: I2eb06df15a6605e8e688de470a0cd926e9989979