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

Change-Id: I34e6480f42957da27aeb6f8ccc6bd91d2304e590