Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 35c5160492
am: e7ca44fd49

Change-Id: I928a47f677cc882ee816b6fa8afb41ead2729466