Merge cherrypicks of ['googleplex-android-review.googlesource.com/26048791', 'googleplex-android-review.googlesource.com/26049084'] into 24Q1-release.android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Id3587334084d2146a9ae8b8e85178b3f1fb149c0

22 files changed, 20 insertions, 32 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 15c5c54..e97fc44 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    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"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 164a07b..389d98e 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    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"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.ipsec/sdk/ipsec-module-sdk-current.zip"
   }
   dest_file: "go/current/current.zip"
   version: ""
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index a4043c9..e781b90 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -401,7 +401,7 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDel
 Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthFirstAndLastExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteIkeLocalDelete$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -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;->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$$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$$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 e6893e7..2b505f3 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -401,7 +401,7 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDel
 Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthFirstAndLastExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteIkeLocalDelete$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
@@ -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;->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$$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$$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/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar b/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
index 59e8871..a2eb44f 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 002db05..763f794 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/public/android.net.ipsec.ike-stubs.jar b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
index 791a7e0..33de10e 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 39475e5..6aa5a3e 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 820ddc7..605c9bd 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 9b70691..d961ec0 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 9a412cc..f354230 100644
--- a/current/sdk_library/system/android.net.ipsec.ike.txt
+++ b/current/sdk_library/system/android.net.ipsec.ike.txt
@@ -5,12 +5,6 @@ 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/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index fffc196..d6e7727 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10917791
\ No newline at end of file
+11207227
\ No newline at end of file
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index a4043c9..e781b90 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -401,7 +401,7 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDel
 Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthFirstAndLastExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteIkeLocalDelete$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -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;->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$$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$$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 e6893e7..2b505f3 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -401,7 +401,7 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDel
 Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthFirstAndLastExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteIkeLocalDelete$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
@@ -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;->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$$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$$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/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar b/go/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
index 59e8871..a2eb44f 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 002db05..763f794 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/public/android.net.ipsec.ike-stubs.jar b/go/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
index 791a7e0..33de10e 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 39475e5..6aa5a3e 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 820ddc7..605c9bd 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 9b70691..d961ec0 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 9a412cc..f354230 100644
--- a/go/current/sdk_library/system/android.net.ipsec.ike.txt
+++ b/go/current/sdk_library/system/android.net.ipsec.ike.txt
@@ -5,12 +5,6 @@ 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/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index fffc196..d6e7727 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10917791
\ No newline at end of file
+11207227
\ No newline at end of file