[automerger skipped] Merge "Move NetworkAgent#register to a new method." am:...

[automerger skipped] Merge "Move NetworkAgent#register to a new method." am: 9309eea2 am: 73e20192 -s ours am: 6e6596e8 -s ours am: ce09480e -s ours am: 4f9bab49 -s ours
am skip reason: Change-Id I1ee5c7b1353d581e487c8a8a159009bebd781643 with SHA-1 29c6e0cc is in history

Change-Id: I0d718011fa9d59ef30bedf0b27bb9cffea9d39cf