Merge "Move NetworkAgent#register to a new method." am: 9309eea2fe

Change-Id: I4ca48f4232ad4733da5ce7f265fc911f5ff1a713