Make change and version bump to aml_net_331910030 for mainline module file: AndroidManifest.xml
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23158531'] into sparse-10071129-L27100000960589020.
SPARSE_CHANGE: Icd37568e4b59efba11a7d1652c1b37ac11b9e3c7

Change-Id: Ib59893d4c12933cd14ceb6c9f08526be98806416

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad39242..3ec8359 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="331910000"
-  android:versionName="aml_net_331910000"
+  android:versionCode="331910030"
+  android:versionName="aml_net_331910030"
   coreApp="true"
 >
     <!--- Defines the MAINLINE_NETWORK_STACK permission used by the networkstack process. -->

tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt

diff --git a/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt b/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
index f1cbd21..5319a0e 100644
--- a/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
+++ b/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
@@ -21,8 +21,11 @@
 import android.app.usage.NetworkStats.Bucket.TAG_NONE
 import android.app.usage.NetworkStatsManager
 import android.net.NetworkTemplate.MATCH_TEST
+import android.os.Build
 import android.os.Process
 import androidx.test.platform.app.InstrumentationRegistry
+import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
+import com.android.testutils.DevSdkIgnoreRunner
 import com.android.testutils.PacketBridge
 import com.android.testutils.RecorderCallback.CallbackEntry.LinkPropertiesChanged
 import com.android.testutils.TestDnsServer
@@ -42,9 +45,9 @@
 import org.junit.After
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
 
-@RunWith(JUnit4::class)
+@RunWith(DevSdkIgnoreRunner::class)
+@IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
 class NetworkStatsIntegrationTest {
     private val INTERNAL_V6ADDR =
         LinkAddress(InetAddresses.parseNumericAddress("2001:db8::1234"), 64)