Merge "Revert "Add ACCESS_NETWORK_STATE permission.""