Merge "Add permission NETWORK_SETTINGS"