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

Change-Id: Ib8c818a3038877b87187659b0ff65a9d31b998e7