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

* commit '7878eee8a9c20752e038f563b98b6b42c372cd0f':
  Rename carrier config constant.