Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 79a632905b
am: 49ccab2d41

Change-Id: I928a47f677cc882ee816b6fa8afb41ead2729466
tree: 5f4a657ee9c880550a00ce23006966104e6b9c0b
  1. core/
  2. services/
  3. tests/