Merge "Refactor Network's use of mUrlConnectionFactory." am: 6e6a18e8bf am: 77910c94c1

Change-Id: I7ce77a1735521cc10ee16a4c6f45e59c0a87585a