Snap for 7266504 from 1f8dd5a79f65df9e24a788f74a3afe74ade7e9d5 to mainline-networkstack-release
Change-Id: I87c94781c68689f037b83fffe594e837a7989038
diff --git a/tests/telephonytests/jarjar-rules-tests.txt b/tests/telephonytests/jarjar-rules-tests.txt
index 91b5b32..7f72469 100644
--- a/tests/telephonytests/jarjar-rules-tests.txt
+++ b/tests/telephonytests/jarjar-rules-tests.txt
@@ -4,3 +4,9 @@
# by services-net and one by telephony-common), similarly to what happens on a
# real device, except that in the test they have different package names.
rule android.net.NetworkFactory* android.net.services.NetworkFactory@1
+
+# Telephony-common has already included net-utils-framework-common lib and jarjars
+# the package name. FrameworksTelephonyTests also includes net-utils-framework-common
+# via net-tests-utils and tries to jarjar it again. Rename the package name with
+# differnt prefix in the test jarjar rule to avoid duplicate jar entries.
+rule com.android.net.module.util.** com.android.internal.telephony.util.test.@1