Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev
am: ade0186795

Change-Id: I94821c8390473ea96c2c8f9a674e736587807477