Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab

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

Change-Id: I1b320ba1c7332b1126843c106ed6f5452e98472a

Android.bp

@@ -252,11 +252,6 @@ java_library {
     installable: false,
 }
 
-filegroup {
-    name: "framework-jarjar-rules",
-    srcs: ["framework-jarjar-rules.txt"],
-}
-
 java_library {
     name: "framework-minus-apex",
     defaults: ["framework-aidl-export-defaults"],
@@ -273,7 +268,7 @@ java_library {
         "--multi-dex",
     ],
     installable: true,
-    jarjar_rules: ":framework-jarjar-rules",
+    jarjar_rules: "framework-jarjar-rules.txt",
     javac_shard_size: 150,
     plugins: [
         "view-inspector-annotation-processor",