FWB: National data roaming and make it optional (1/3)

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

Change-Id: Ie5200e5756ee8b6139a775a366718d652ab6f480

Conflicts:
	core/java/android/provider/Settings.java