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

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

Change-Id: I524f3b71e9e8ef3483351adc4907fba4622e4b3c