Don't show NTT docomo carrier label while roaming

Change-Id: If1b307c89122494045de6e65d81581521421e8ef

Conflicts:
	prebuilt/common/etc/spn-conf.xml
corrected Vodafone DE & Vodafone PT APNs

Vodafone DE settings found here:

http://hilfe.vodafone.de/system/selfservice.controller?CONFIGURATION=1004&PARTITION_ID=1&CMD=VIEW_ARTICLE&LANGUAGE=de&COUNTRY=de&TOPIC_ID=176177&FEATURE_TOP_ID=1188&PARENT_TOPIC_ID=1188&ARTICLE_ID=2746650&DISPLAY=SUBTOPICARTICLES&HANDLERMODE=NOJSPAGE&SOURCE_RELATED_ARTICLE=true

Vodafone PT settings found here:

https://ajuda.vodafone.pt/system/selfservice.controller?CONFIGURATION=2353&PARTITION_ID=1&USERTYPE=1&LANGUAGE=pt&COUNTRY=pt&CMD=BROWSE_TOPIC&requestedPage=device&TOPIC_ID=1368679&LEV1_TOPIC_ID=1368621&LEFT_NAV_ID=1368673

Change-Id: I117068c00ff862fcc99ff2fa92f2919813cad021