Merge "fix TelephonyNetworkFactory unit test failure"