Merge "Have registerNetworkAgent return a Network." am: 061d68a40c am: 02cfa7aaf3

Change-Id: I6460295b5c7c045a3d60f5c281295f3a0cf83110