Merge "Add CarrierConfig option to not display HD icon"
am: 8b41f61b0e

Change-Id: I4e352299e569676a04721b32579e49fc4da8a3d5