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

Change-Id: I7b33003443e9f9bf173f6ec7e3942bed2c6714a5