Make change and version bump to aml_net_311313000 for mainline module file: AndroidManifest.xml

Change-Id: Icb07ef372997a5c1b6d5443857d52cd9f679fdff

Android.bp

diff --git a/Android.bp b/Android.bp
index f2b6222..e241b4c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -215,6 +215,8 @@
     static_libs: [
         "androidx.annotation_annotation",
         "modules-utils-build_system",
+        "modules-utils-preconditions",
+        "modules-utils-statemachine",
         "netd_aidl_interface-lateststable-java",
         "networkstack-client",
         "net-utils-framework-common",

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5560207..5c1c69c 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="311312000"
-  android:versionName="aml_net_311312000"
+  android:versionCode="311313000"
+  android:versionName="aml_net_311313000"
   coreApp="true"
 >
     <!-- Permissions must be defined here, and not in the base manifest, as the network stack

src/android/net/ip/IpReachabilityMonitor.java

diff --git a/src/android/net/ip/IpReachabilityMonitor.java b/src/android/net/ip/IpReachabilityMonitor.java
index 0f199e2..435d4ca 100644
--- a/src/android/net/ip/IpReachabilityMonitor.java
+++ b/src/android/net/ip/IpReachabilityMonitor.java
@@ -570,7 +570,7 @@
             }
         }
 
-        mNumSolicits = numSolicits;
+        mNumSolicits = isMulticastResolicitEnabled() ? (numSolicits + numResolicits) : numSolicits;
         mInterSolicitIntervalMs = interSolicitIntervalMs;
     }