Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 901eda31

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2756401



Change-Id: I8955771036c93e8e33bf8e50c76ce8ddb35bff57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

api/StubLibraries.bp

@@ -66,6 +66,7 @@ droidstubs {
             tag: ".removed-api.txt",
         },
     ],
+    api_surface: "public",
 }
 
 priv_apps = " --show-annotation android.annotation.SystemApi\\(" +
@@ -119,6 +120,7 @@ droidstubs {
             tag: ".removed-api.txt",
         },
     ],
+    api_surface: "system",
 }
 
 droidstubs {
@@ -164,6 +166,7 @@ droidstubs {
             tag: ".removed-api.txt",
         },
     ],
+    api_surface: "test",
 }
 
 droidstubs {
@@ -203,6 +206,7 @@ droidstubs {
             tag: ".removed-api.txt",
         },
     ],
+    api_surface: "module-lib",
 }
 
 /////////////////////////////////////////////////////////////////////

services/Android.bp

@@ -274,4 +274,5 @@ droidstubs {
             tag: ".removed-api.txt",
         },
     ],
+    api_surface: "system-server",
 }