Merge changes from topics "bluetooth-localsocket-from-filedescriptor", "localsocket-from-filedescriptor" am: 63c3c1f3d4 am: 35dda7049d am: ca3d992029 am: 89826ba131

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

Change-Id: I8f981549f0a4bdcf04332fc1f05d1e12a6b1893f

core/java/android/net/LocalSocket.java

@@ -108,19 +108,6 @@ public class LocalSocket implements Closeable {
         checkConnected();
     }
 
-    /**
-     * Creates a LocalSocket instances using the FileDescriptor for an already-connected
-     * AF_LOCAL/UNIX domain stream socket. Note: the FileDescriptor must be closed by the caller:
-     * closing the LocalSocket will not close it.
-     *
-     * TODO: delete this method when Bluetooth is no longer using it.
-     *
-     * @hide
-     */
-    public static LocalSocket createConnectedLocalSocket(FileDescriptor fd) {
-        return new LocalSocket(fd);
-    }
-
     /**
      * for use with LocalServerSocket.accept()
      */