Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL" am: 7be7d422a2
am: 784a690ec7

Change-Id: I0e4098cfd0fe0d78e2d5de33a193da1095974ea6