Revert "Telephony: Forward port National data roaming and make it optional (1/2)"

This reverts commit 1fd6a6337a7a9187695131c25fa73237946a0cac.

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