Rename merged services.txt module

This makes it follow the same naming pattern as other modules
in this directory, which makes it easier to auto-generate.

Bug: 169103987
Test: m
Change-Id: I1c68a433808c034e83049239a72c9b505546bf20

api/Android.bp

@@ -402,7 +402,7 @@ genrule {
 }
 
 genrule {
-    name: "services-system-server-current.txt",
+    name: "frameworks-base-api-system-server-current.txt",
     srcs: [
         ":service-permission{.system-server.api.txt}",
         ":non-updatable-system-server-current.txt",
@@ -428,7 +428,7 @@ genrule {
 }
 
 genrule {
-    name: "services-system-server-removed.txt",
+    name: "frameworks-base-api-system-server-removed.txt",
     srcs: [
         ":service-permission{.system-server.removed-api.txt}",
         ":non-updatable-system-server-removed.txt",