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

Change-Id: Iff8a0016d439b3855e415835b2a0017fc3f910c7