Merge "Refactor: Remove unused branch." am: a9f7998ff4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1820992

Change-Id: Ic4a2d7911ab6d30d24b27596c42069e534f99db9

core/java/android/webkit/URLUtil.java

@@ -310,7 +310,7 @@ public final class URLUtil {
         String extension = null;
 
         // If we couldn't do anything with the hint, move toward the content disposition
-        if (filename == null && contentDisposition != null) {
+        if (contentDisposition != null) {
             filename = parseContentDisposition(contentDisposition);
             if (filename != null) {
                 int index = filename.lastIndexOf('/') + 1;