[2/3] Phone: Forward port Add national data roaming and make it optional

  by Robin Morawetz (Rdlgrmpf) and Davor Bertovic (LorD ClockaN)
  Id: I9fccddf4d9081d228540d5e62f132383b9579c52

Change-Id: I463e8127462ab097cad2f52284235f80f095a11e

Conflicts:

	res/values/strings.xml