am 4beba12c: am 6bd0513a: Merge "Drop the "Config". Just "CarrierService". It\'s cleaner." into mnc-dev

* commit '4beba12c70c1060a5cb7718c62e7b0ab609d0dea':
  Drop the "Config". Just "CarrierService". It's cleaner.