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

This reverts commit 1fd6a6337a7a9187695131c25fa73237946a0cac.

Change-Id: Iab1d121c3b016ec6ca3ee727c4e8f6a65e15a933