Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev