Merge "Add CarrierConfig option to not display HD icon"