Bazel: Add Java target for merged config proto attempt 2

Change-Id: If34e53dd8cadc1b24e6f2c6939e026599997ae86
diff --git a/BUILD b/BUILD
index 4289eb0..c1c07f4 100644
--- a/BUILD
+++ b/BUILD
@@ -3213,9 +3213,9 @@
 )
 
 perfetto_java_proto_library(
-    name = "protos_perfetto_trace_merged_config_java",
+    name = "protos_perfetto_config_merged_config_java",
     deps = [
-        ":protos_perfetto_trace_merged_config_protos",
+        ":protos_perfetto_config_merged_config_protos",
     ],
 )