Merge "Set the value of KEY_CARRIER_CONFIG_OVERRIDE_BOOL"
am: f025fbde93

Change-Id: I9d2b5cd5ebd89e593ef0946578f1f13e802baf58