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

Change-Id: I8a7df442d36379ef4a8a917f8d42d170b2d98e3c