Merge "Remove duplicate new TelephonyNetworkFactory[#]" am: 58b27d7aa0 am: 50b3804dd9 am: f00c011a48 am: 138b6d59dc
am: c4e2591830

Change-Id: Ic8f21b89ea05860e9ff9441b273b684749744aed