[automerger skipped] Merge "Move NetworkAgent#register to a new method." am: 9309eea2fe am: 73e201927e -s ours am: 6e6596e81c -s ours am: ce09480e3a -s ours am: 4f9bab495f -s ours
am skip reason: Change-Id I1ee5c7b1353d581e487c8a8a159009bebd781643 with SHA-1 29c6e0cc51 is in history

Change-Id: I0d718011fa9d59ef30bedf0b27bb9cffea9d39cf