Merge "Add carrier config keys for disabling HD icon" into nyc-mr1-dev