[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am: 34ce11f2bd
am: 3958c1c6b2  -s ours

Change-Id: I6da127bed317ba1faf995ebb0236d91774782acb
tree: d1a43430c73d757337b181a1fa7a2c4a687ad47e
  1. core/
  2. services/
  3. tests/