Rebase master

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/owncloud/android/files/services/FileUploader.java

@@ -977,8 +977,7 @@ public class FileUploader extends Service
         OCFile existingFile,
         Integer behaviour,
         NameCollisionPolicy nameCollisionPolicy,
-        boolean disableRetries
-                                       ) {
+        boolean disableRetries) {
         uploadUpdateFile(context,
                          user,
                          new OCFile[]{existingFile},