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