[3/3] Base: National Data Roaming

Credits: CM

Change-Id: I2d3809fdc1d1af6b528df4920f0bb35fe0b1d5d7

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