Merge Android 24Q1 Release (ab/11220357)temp_319669529

Bug: 319669529
Merged-In: I2a8de64f311f38c5efe77de1cdf5589d253970b6
Change-Id: I0c508949eb91bb74e914ba5cf3a9e9ce4753c8e7

28 files changed, 62 insertions, 48 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 9e6b4c4..15c5c54 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
 drops {
   android_build_drop {
-    build_id: "T1007601"
-    target: "train_build"
-    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip"
+    build_id: "10917791"
+    target: "mainline_modules_sdks-trunk-userdebug"
+    source_file: "mainline-sdks/for-latest-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/IPsec"
-  git_branch: "udc-d1-dev"
+  git_branch: "main"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 6842269..164a07b 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,14 +1,14 @@
 drops {
   android_build_drop {
-    build_id: "T1007188"
-    target: "train_build"
-    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.ipsec/sdk/ipsec-module-sdk-current.zip"
+    build_id: "10917791"
+    target: "mainline_go_modules_sdks-trunk-userdebug"
+    source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.ipsec/sdk/ipsec-module-sdk-current.zip"
   }
   dest_file: "go/current/current.zip"
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/IPsec"
-  git_branch: "udc-dev"
+  git_branch: "main"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 3bab121..a4043c9 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -502,8 +502,8 @@ Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgo
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->setSeed(J)V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->setSeed([B)V,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda0;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/IkeSecurityParameterIndex;->close()V,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index a3490ca..e6893e7 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -502,8 +502,8 @@ Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgo
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->setSeed(J)V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->setSeed([B)V,core-platform-api,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda0;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/IkeSecurityParameterIndex;->close()V,core-platform-api,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 6edb40a..d875248 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -10,18 +10,18 @@ Lcom/android/internal/util/State;->enter()V,frameworks/libs/modules-utils/java/c
 Lcom/android/internal/util/State;->exit()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L
 Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,58,5,58,25,
 Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,76,5,76,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1304,5,1304,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1318,5,1318,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1684,5,1684,25,
-Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1714,5,1714,25,
-Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1728,5,1728,25,
-Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1783,5,1783,25,
-Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1303,5,1303,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1317,5,1317,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1327,5,1327,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1360,5,1360,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1379,5,1379,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1418,5,1418,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1683,5,1683,25,
+Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1703,5,1703,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1713,5,1713,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1727,5,1727,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1741,5,1741,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1768,5,1768,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1782,5,1782,25,
+Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2069,5,2069,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2086,5,2086,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar b/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
index a2eb44f..59e8871 100644
--- a/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
+++ b/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar b/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar
index 763f794..002db05 100644
--- a/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar
diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
index 3560433..f6a81e6 100644
--- a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
+++ b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
diff --git a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
index 33de10e..791a7e0 100644
--- a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
+++ b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
diff --git a/current/sdk_library/public/android.net.ipsec.ike.srcjar b/current/sdk_library/public/android.net.ipsec.ike.srcjar
index 6aa5a3e..39475e5 100644
--- a/current/sdk_library/public/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/public/android.net.ipsec.ike.srcjar
diff --git a/current/sdk_library/system/android.net.ipsec.ike-stubs.jar b/current/sdk_library/system/android.net.ipsec.ike-stubs.jar
index 605c9bd..820ddc7 100644
--- a/current/sdk_library/system/android.net.ipsec.ike-stubs.jar
+++ b/current/sdk_library/system/android.net.ipsec.ike-stubs.jar
diff --git a/current/sdk_library/system/android.net.ipsec.ike.srcjar b/current/sdk_library/system/android.net.ipsec.ike.srcjar
index d961ec0..9b70691 100644
--- a/current/sdk_library/system/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/system/android.net.ipsec.ike.srcjar
diff --git a/current/sdk_library/system/android.net.ipsec.ike.txt b/current/sdk_library/system/android.net.ipsec.ike.txt
index f354230..9a412cc 100644
--- a/current/sdk_library/system/android.net.ipsec.ike.txt
+++ b/current/sdk_library/system/android.net.ipsec.ike.txt
@@ -5,6 +5,12 @@ package android.net.eap {
     method @Deprecated @Nullable public android.net.eap.EapSessionConfig.EapMsChapV2Config getEapMsChapV2onfig();
   }
 
+  public static class EapSessionConfig.EapAkaConfig extends android.net.eap.EapSessionConfig.EapUiccConfig {
+  }
+
+  public static class EapSessionConfig.EapSimConfig extends android.net.eap.EapSessionConfig.EapUiccConfig {
+  }
+
   @Deprecated public abstract static class EapSessionConfig.EapUiccConfig extends android.net.eap.EapSessionConfig.EapMethodConfig {
     method @Deprecated public int getAppType();
     method @Deprecated public int getSubId();
diff --git a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
index 96e3825..d380937 100644
--- a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
+++ b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 421f01b..fffc196 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10612203
\ No newline at end of file
+10917791
\ No newline at end of file
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index 9db51ce..a4043c9 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -490,6 +490,7 @@ Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSynthet
 Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$Ipv6AddrInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api
@@ -501,8 +502,8 @@ Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgo
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->setSeed(J)V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->setSeed([B)V,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda0;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/IkeSecurityParameterIndex;->close()V,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
index a719631..e6893e7 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -490,6 +490,7 @@ Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSynthet
 Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$Ipv6AddrInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api
@@ -501,8 +502,8 @@ Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgo
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->setSeed(J)V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->setSeed([B)V,core-platform-api,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda0;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/FdEventsReader$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/utils/IkeSecurityParameterIndex;->close()V,core-platform-api,public-api,system-api,test-api
diff --git a/go/current/hiddenapi/index.csv b/go/current/hiddenapi/index.csv
index 6edb40a..d875248 100644
--- a/go/current/hiddenapi/index.csv
+++ b/go/current/hiddenapi/index.csv
@@ -10,18 +10,18 @@ Lcom/android/internal/util/State;->enter()V,frameworks/libs/modules-utils/java/c
 Lcom/android/internal/util/State;->exit()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L
 Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,58,5,58,25,
 Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,76,5,76,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1304,5,1304,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1318,5,1318,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1684,5,1684,25,
-Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1714,5,1714,25,
-Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1728,5,1728,25,
-Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1783,5,1783,25,
-Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1303,5,1303,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1317,5,1317,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1327,5,1327,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1360,5,1360,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1379,5,1379,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1418,5,1418,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1683,5,1683,25,
+Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1703,5,1703,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1713,5,1713,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1727,5,1727,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1741,5,1741,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1768,5,1768,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1782,5,1782,25,
+Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2069,5,2069,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2086,5,2086,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/go/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar b/go/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
index a2eb44f..59e8871 100644
--- a/go/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
+++ b/go/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
diff --git a/go/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar b/go/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar
index 763f794..002db05 100644
--- a/go/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar
+++ b/go/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar
diff --git a/go/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip b/go/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
index 3560433..f6a81e6 100644
--- a/go/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
+++ b/go/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
diff --git a/go/current/sdk_library/public/android.net.ipsec.ike-stubs.jar b/go/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
index 33de10e..791a7e0 100644
--- a/go/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
+++ b/go/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
diff --git a/go/current/sdk_library/public/android.net.ipsec.ike.srcjar b/go/current/sdk_library/public/android.net.ipsec.ike.srcjar
index 6aa5a3e..39475e5 100644
--- a/go/current/sdk_library/public/android.net.ipsec.ike.srcjar
+++ b/go/current/sdk_library/public/android.net.ipsec.ike.srcjar
diff --git a/go/current/sdk_library/system/android.net.ipsec.ike-stubs.jar b/go/current/sdk_library/system/android.net.ipsec.ike-stubs.jar
index 605c9bd..820ddc7 100644
--- a/go/current/sdk_library/system/android.net.ipsec.ike-stubs.jar
+++ b/go/current/sdk_library/system/android.net.ipsec.ike-stubs.jar
diff --git a/go/current/sdk_library/system/android.net.ipsec.ike.srcjar b/go/current/sdk_library/system/android.net.ipsec.ike.srcjar
index d961ec0..9b70691 100644
--- a/go/current/sdk_library/system/android.net.ipsec.ike.srcjar
+++ b/go/current/sdk_library/system/android.net.ipsec.ike.srcjar
diff --git a/go/current/sdk_library/system/android.net.ipsec.ike.txt b/go/current/sdk_library/system/android.net.ipsec.ike.txt
index f354230..9a412cc 100644
--- a/go/current/sdk_library/system/android.net.ipsec.ike.txt
+++ b/go/current/sdk_library/system/android.net.ipsec.ike.txt
@@ -5,6 +5,12 @@ package android.net.eap {
     method @Deprecated @Nullable public android.net.eap.EapSessionConfig.EapMsChapV2Config getEapMsChapV2onfig();
   }
 
+  public static class EapSessionConfig.EapAkaConfig extends android.net.eap.EapSessionConfig.EapUiccConfig {
+  }
+
+  public static class EapSessionConfig.EapSimConfig extends android.net.eap.EapSessionConfig.EapUiccConfig {
+  }
+
   @Deprecated public abstract static class EapSessionConfig.EapUiccConfig extends android.net.eap.EapSessionConfig.EapMethodConfig {
     method @Deprecated public int getAppType();
     method @Deprecated public int getSubId();
diff --git a/go/current/sdk_library/system/android.net.ipsec.ike_annotations.zip b/go/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
index 96e3825..d380937 100644
--- a/go/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
+++ b/go/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index f9eedbc..fffc196 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10414058
\ No newline at end of file
+10917791
\ No newline at end of file