Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: Ifcd87eaf20d5a14bc1a67bfc837900818cef4641
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 75960bb..fb37356 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.networkstack.permissionconfig"
     android:sharedUserId="android.uid.networkstack"
-    android:versionCode="299900000"
+    android:versionCode="290000000"
     android:versionName="2019-09"
 >
     <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />