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

This reverts commit 94e055d41bc810cac92fa4ae7d52aa71f20e6bbd

Change-Id: Ie1db9c0214d29e2b8f1f51279fe916a5241f2b7f