am 603cfdce: am 6a9baca0: am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev

* commit '603cfdcea1e53f963b27d33bb1f0579a619cc9ca':
  Rename carrier config constant.