[autotest] Fix naming for test suites with --run_prod_code

BUG=chromium:585625
TEST=moblab suite run

Change-Id: I8e3b7e31d0d007008d727d41006803fb20c3d45f
Reviewed-on: https://chromium-review.googlesource.com/326893
Commit-Ready: Simran Basi <sbasi@chromium.org>
Tested-by: Simran Basi <sbasi@chromium.org>
Reviewed-by: Dan Shi <dshi@chromium.org>
diff --git a/frontend/afe/site_rpc_interface.py b/frontend/afe/site_rpc_interface.py
index 5b625a5..7e2734a 100644
--- a/frontend/afe/site_rpc_interface.py
+++ b/frontend/afe/site_rpc_interface.py
@@ -223,9 +223,9 @@
         suite_name = canonicalize_suite_name(name)
         control_file = _get_control_file_contents_by_name(test_source_build,
                                                           ds, suite_name)
-        # Do not change this naming convention without updating
-        # site_utils.parse_job_name.
-        name = '%s-%s' % (test_source_build, suite_name)
+    # Do not change this naming convention without updating
+    # site_utils.parse_job_name.
+    name = '%s-%s' % (test_source_build, suite_name)
 
     timeout_mins = timeout_mins or timeout * 60
     max_runtime_mins = max_runtime_mins or timeout * 60