Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev am: b68601d247
am: 701cd3fe15
* commit '701cd3fe15148f561c27b9a2b65da79b6f36c1c8':
Change-Id: Ic8ee22af2923a4c8847966d34b7e03712bcfc09e
This commit is contained in: