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

* commit '6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2':
  Rename carrier config constant.