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

* commit 'fa6f549adca29b7452b7dd3cd9eb1c429ad2d7dc':
  Rename carrier config constant.