Snap for 6264568 from b8d46ba1fcab56f24404ce2edf270376f3c216f0 to rvc-release

Change-Id: Ibd3a04d97953cc5ecbe2e10a5d3f665037b65642
diff --git a/Android.bp b/Android.bp
index d05dcb8..7c28e70 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,6 +29,8 @@
     name: "NetworkPermissionConfig",
     defaults: ["NetworkPermissionConfigDefaults"],
     certificate: "networkstack",
+    target_sdk_version: "29",
+    min_sdk_version: "29",
 }
 
 // Alternative stub APK signed with platform certificate. To use with InProcessNetworkStack.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 073784c..4b5ac58 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,8 +22,6 @@
     android:versionCode="300000000"
     android:versionName="2019-09"
   >
-  <!-- TODO: Uncomment this when the R API level is fixed. b/148281152 -->
-  <!--uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />-->
     <!--
     This package only exists to define the below permissions, and enforce that they are only
     granted to apps sharing the same signature.