Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL"
am: 7be7d422a2

Change-Id: I9d71fb9956f2300d683893da8dd3a78ca8320bc8