Merge "Add DISALLOW_DATA_ROAMING restriction support to settings"