Merge "Rename carrier config constant." into mnc-dr-dev