Merge remote-tracking branch 'aosp/upstream-master' am: f3b6953e53 am: 7c35d9218e

Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2907692

Change-Id: I6fe47424221604bbbb198e957bc9c5a414dd806f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/METADATA b/METADATA
index e3362f4..7f221e5 100644
--- a/METADATA
+++ b/METADATA
@@ -8,7 +8,7 @@
     type: GIT
     value: "https://github.com/google/jarjar.git"
   }
-  version: "07130d7bb682571c670ff3f1fcddcd5230a56b9d"
-  last_upgrade_date { year: 2024 month: 1 day: 10 }
+  version: "8ce1d0abd195c24a75d9ddcb0ea31b1d1b62aaa6"
+  last_upgrade_date { year: 2024 month: 1 day: 12 }
   license_type: NOTICE
 }
diff --git a/src/main/com/tonicsystems/jarjar/MainProcessor.java b/src/main/com/tonicsystems/jarjar/MainProcessor.java
index 1f676c2..5839719 100644
--- a/src/main/com/tonicsystems/jarjar/MainProcessor.java
+++ b/src/main/com/tonicsystems/jarjar/MainProcessor.java
@@ -96,6 +96,7 @@
         new JarTransformerChain(
             new RemappingClassTransformer[] {new RemappingClassTransformer(pr)}));
     processors.add(new ResourceProcessor(pr));
+    processors.add(new ServiceProcessor(pr));
     chain = new JarProcessorChain(processors.toArray(new JarProcessor[0]));
   }