Merge "Rename NetworkStack package"

diff --cc data/etc/privapp-permissions-platform.xml
index 4b247c6,3723ee2..78bbcf1
--- 1/data/etc/privapp-permissions-platform.xml
--- 2/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@@ -200,8 -199,9 +200,8 @@@ applications that come with the platfor
          <permission name="android.permission.USE_RESERVED_DISK"/>
      </privapp-permissions>
  
-     <privapp-permissions package="com.android.mainline.networkstack">
+     <privapp-permissions package="com.android.networkstack">
          <permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>
 -        <permission name="android.permission.CHANGE_BACKGROUND_DATA_SETTING"/>
          <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
          <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
          <permission name="android.permission.CONTROL_VPN"/>

diff --cc packages/NetworkStack/AndroidManifest.xml
Simple merge