Merge "Add SocketUtils CTS tests" am: 37377069ba
am: f97246a87c

Change-Id: I11e638a2fab004979298708a5c75bb7c2f208f67
tree: c57ca8b86787833166bec30d01b844823114c5d7
  1. core/
  2. services/
  3. tests/