Merge "Apply android.jar defaults to system server stub" am: ded634226a am: 03ec044101

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

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

StubLibraries.bp

@@ -364,15 +364,15 @@ java_library {
 
 java_library {
     name: "android_system_server_stubs_current",
-    defaults: ["android_stubs_dists_default"],
+    defaults: [
+        "android.jar_defaults",
+        "android_stubs_dists_default",
+    ],
     srcs: [":services-non-updatable-stubs"],
     installable: false,
     static_libs: [
         "android_module_lib_stubs_current",
     ],
-    sdk_version: "none",
-    system_modules: "none",
-    java_version: "1.8",
     dist: {
         dir: "apistubs/android/system-server",
     },