Merge "Fix socket leaks in various android.net.Network methods." into pi-dev
am: 4baa5d48e3

Change-Id: I2a2254ce65c2176ae0be1d6276034b1bb0cad987
tree: 085c6cf5899c54a19becebc198fb8432135c6ccd
  1. core/
  2. services/
  3. tests/