Snap for 8666349 from f42b9adcdd4e74d8fa33ccba4a2731929927c227 to tm-qpr1-release

Change-Id: If6f73f923a22dd8b57c5db71063be3c4ea39832d
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad6c2b5..d616750 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.networkstack"
   android:sharedUserId="android.uid.networkstack"
-  android:versionCode="319999900"
-  android:versionName="s_aml_319999900"
+  android:versionCode="339990000"
+  android:versionName="339990000"
   coreApp="true"
 >
     <!--- Defines the MAINLINE_NETWORK_STACK permission used by the networkstack process. -->
diff --git a/AndroidManifest_Next.xml b/AndroidManifest_Next.xml
index 244d465..ff2dcdd 100644
--- a/AndroidManifest_Next.xml
+++ b/AndroidManifest_Next.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.networkstack"
           android:sharedUserId="android.uid.networkstack"
-          android:versionCode="320000000"
+          android:versionCode="330090000"
           android:versionName="T-next"
           coreApp="true">
 </manifest>