Integrate duplicated NTT DOCOMO carrier labels

Integrate two separate NTT DOCOMO carrier labels into a single label.

before: http://imgur.com/2D3qjd1
after: http://imgur.com/YJh0gxq

Change-Id: I87c3dcad947cda779b3b4a4b2ffdc2a6f63dbe5c
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_vendor_cm into cm-11.0