[automerger skipped] Merge "Have registerNetworkAgent return a Network." am: 061d68a40c am: 59b776a9e5 am: 5fd790f968 -s ours
am skip reason: Change-Id I74710b396fa3cec6fbae08d3dcab5bc90dc2e669 with SHA-1 b0a42f7284 is in history

Change-Id: Ia9d3bae2cb8554d85685f6bfd6412d676a347bc7
tree: 5f2e6913f15cf65034d9dff3adcd391de1e2d0d2
  1. core/
  2. services/
  3. tests/