Merge "Revert "Add permission NETWORK_SETTINGS""