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

Change-Id: Ib0a33a398cafb9d2f5fcb39a3e31929c2b088c94