Merge "Refactor Network's use of mUrlConnectionFactory." am: 6e6a18e8 am: 77910c94 am: c9b9c30c Change-Id: I66c7b133b03b1634a9adaefb5fd033892adb50dd