Revert "Phone: Forward port Add national data roaming and make it optional (2/2)"

This reverts commit 28f2204b64dfa78c5519e9216d5f3089fa55f92d.

Conflicts:

	res/values/strings.xml
Revert "Phone : Update reference to Apn Settings"

This reverts commit 0cc39b498feeba2310d6677e45cfffffd894d0e3.