Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 0a30c831a4 am: 43b1fa710e am: 3327d66cc8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I446cca57e6841c923ea89ce8f8eddfd1b8e60b79

framework/src/android/net/QosSocketInfo.java

@@ -92,7 +92,7 @@ public final class QosSocketInfo implements Parcelable {
         Objects.requireNonNull(socket, "socket cannot be null");
 
         mNetwork = Objects.requireNonNull(network, "network cannot be null");
-        mParcelFileDescriptor = ParcelFileDescriptor.dup(socket.getFileDescriptor$());
+        mParcelFileDescriptor = ParcelFileDescriptor.fromSocket(socket);
         mLocalSocketAddress =
                 new InetSocketAddress(socket.getLocalAddress(), socket.getLocalPort());
     }