[1/3] opt_telephony: National Data Roaming

Credits: CyanogenMod

Linked commits:
        frameworks/base: https://gerrit.paranoidandroid.co/#/c/3654/
        services/Telephony: https://gerrit.paranoidandroid.co/#/c/3656/

Change-Id: I1cbb3dc5610a720fd5a7d7dfd35db513126d496f

Conflicts:
	src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java