Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer"