Merge \"Add carrier config keys for disabling HD icon\" into nyc-mr1-dev
am: 9adea2e246

Change-Id: I1a43d0e6738a41860078ee710d5b57f9a9e66cd5