Merge "usesCleartextTraffic in NetworkPermissionConfig" am: 46dc3a25e0 am: 21e6f25ab0 am: f30857ae42 am: c1e6d9f82b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1420011

Change-Id: I49468ccb24f08d6ff7f47ebf70c82a6ebfa823f0
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4b5ac58..ff94f59 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,5 +36,8 @@
     <permission android:name="android.permission.MAINLINE_NETWORK_STACK"
                 android:protectionLevel="signature"/>
 
-    <application android:name="com.android.server.NetworkPermissionConfig"/>
+    <!-- The application must declare usesClearTraffic because it uses the same UID as the
+         NetworkStack module, which does cleartext traffic (b/161860610). -->
+    <application android:name="com.android.server.NetworkPermissionConfig"
+                 android:usesCleartextTraffic="true"/>
 </manifest>