Merge "Add CarrierConfig option to not display HD icon" am: 8b41f61b0e am: 431350d9dd am: a47260455d  -s ours
am: 8f5dde9c9d  -s ours

Change-Id: Ibf4cb2745299a06407672cd0fa6a0b7a73a92747