diff --git a/core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java b/core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java
index b278dbafd5e1..bd2f36fb5198 100644
--- a/core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java
+++ b/core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java
@@ -16,13 +16,14 @@
 
 package android.tracing.perfetto;
 
+import static android.internal.perfetto.protos.PerfettoTrace.TestEvent.PAYLOAD;
+import static android.internal.perfetto.protos.PerfettoTrace.TestEvent.TestPayload.SINGLE_INT;
+import static android.internal.perfetto.protos.PerfettoTrace.TracePacket.FOR_TESTING;
+
 import static java.io.File.createTempFile;
 import static java.nio.file.Files.createTempDirectory;
 
-import static perfetto.protos.PerfettoTrace.TestEvent.PAYLOAD;
-import static perfetto.protos.PerfettoTrace.TestEvent.TestPayload.SINGLE_INT;
-import static perfetto.protos.PerfettoTrace.TracePacket.FOR_TESTING;
-
+import android.internal.perfetto.protos.PerfettoTrace;
 import android.tools.common.ScenarioBuilder;
 import android.tools.common.Tag;
 import android.tools.common.io.TraceType;
@@ -56,7 +57,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import perfetto.protos.PerfettoConfig;
-import perfetto.protos.PerfettoTrace;
 import perfetto.protos.TracePacketOuterClass;
 
 @RunWith(AndroidJUnit4.class)
diff --git a/framework-jarjar-rules.txt b/framework-jarjar-rules.txt
index 03b268d87d01..6339a8703f01 100644
--- a/framework-jarjar-rules.txt
+++ b/framework-jarjar-rules.txt
@@ -8,3 +8,6 @@ rule com.android.server.vcn.util.** com.android.server.vcn.repackaged.util.@1
 
 # for modules-utils-build dependency
 rule com.android.modules.utils.build.** android.internal.modules.utils.build.@1
+
+# For Perfetto proto dependencies
+rule perfetto.protos.** android.internal.perfetto.protos.@1