[3/3] frameworks/base: National Data Roaming

Credits: CyanogenMod

Linked commits:
        opt/telephony: https://gerrit.paranoidandroid.co/#/c/3655/
        services/Telephony: https://gerrit.paranoidandroid.co/#/c/3656/

Change-Id: I0280d516067e1ef50f7321355cbee42009657d7e

Conflicts:
	core/java/android/provider/Settings.java