[automerger skipped] Merge "Have registerNetworkAgent return a Network." am: 061d68a40c am: 02cfa7aaf3 am: b65829d453 -s ours
am skip reason: Change-Id I74710b396fa3cec6fbae08d3dcab5bc90dc2e669 with SHA-1 a0e2aa127a is in history

Change-Id: Ia9d3bae2cb8554d85685f6bfd6412d676a347bc7