fix: fix mistake in manual merging.

Author: zhumin8

gapic-generator-java/src/test/java/com/google/api/generator/gapic/protoparser/ParserTest.java

@@ -623,7 +623,6 @@ public void parseServiceApiVersionTest() {
             new HashSet<>());
     com.google.api.generator.gapic.model.Service parsedEchoService = services.get(0);
 
-    assertEquals("Echo", parsedEchoService.overriddenName());
     assertEquals("EchoWithVersion", parsedEchoService.overriddenName());
     assertTrue(parsedEchoService.hasApiVersion());
     assertEquals("fake_version", parsedEchoService.apiVersion());

gapic-generator-java/src/test/proto/api_version_testing.proto

@@ -24,7 +24,6 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 
-package google.api.version.test;
 package google.api.version.test.v1;
 
 option java_package = "com.google.api.version.test";