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

Change-Id: I3ad8fd8479e91bc34b21297b7953a38372431a8c