Merge cherrypicks of ['googleplex-android-review.googlesource.com/30870281'] into 25Q1-release.

Change-Id: I7b1bd3439c87905ab2f843450343935c97c3b3ca
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 8124b26..c831cd1 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "12750773"
+    build_id: "12785903"
     target: "train_build"
     source_file: "mainline-sdks/for-latest-build/current/com.google.android.wifi/sdk/wifi-module-sdk-current.zip"
   }
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 05a1375..729c2f1 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -1476,8 +1476,8 @@
 Landroid/net/wifi/WifiContext;->getAssets()Landroid/content/res/AssetManager;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiContext;->getResources()Landroid/content/res/Resources;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiContext;->getTheme()Landroid/content/res/Resources$Theme;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiEnterpriseConfig$2;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiEnterpriseConfig$2;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig$Eap;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig$Eap;->AKA:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig$Eap;->AKA_PRIME:I,public-api,sdk,system-api,test-api
@@ -5376,6 +5376,8 @@
 Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/android/sysprop/NfcProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/android/sysprop/NfcProperties$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/android/sysprop/TelephonyProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1ConnectAsync;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$AsyncChannelConnection;->onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V,public-api,sdk,system-api,test-api
@@ -5419,6 +5421,7 @@
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda15;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda16;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda17;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,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 1063afb..028e00e 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -1084,8 +1084,8 @@
 Landroid/net/wifi/WifiContext;->getAssets()Landroid/content/res/AssetManager;,public-api,system-api,test-api
 Landroid/net/wifi/WifiContext;->getResources()Landroid/content/res/Resources;,public-api,system-api,test-api
 Landroid/net/wifi/WifiContext;->getTheme()Landroid/content/res/Resources$Theme;,public-api,system-api,test-api
-Landroid/net/wifi/WifiEnterpriseConfig$2;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/wifi/WifiEnterpriseConfig$2;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig$Eap;->AKA:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig$Eap;->AKA_PRIME:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig$Eap;->NONE:I,public-api,system-api,test-api
@@ -3672,6 +3672,8 @@
 Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/android/sysprop/NfcProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/android/sysprop/NfcProperties$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/android/sysprop/TelephonyProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1ConnectAsync;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$AsyncChannelConnection;->onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V,public-api,system-api,test-api
@@ -3715,6 +3717,7 @@
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda15;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda16;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda17;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/wifi/flags/CustomFeatureFlags$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 255be29..c3ce848 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -76,9 +76,9 @@
 Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1942,5,1942,25,
 Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2071,5,2071,25,
 Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2075,5,2075,25,
-Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,5953,5,5953,25,
-Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8413,5,8413,25,
-Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8459,5,8462,6,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+%23setVerboseLoggingEnabled%28boolean%29%7D+instead.%22
+Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,5954,5,5954,25,
+Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8414,5,8414,25,
+Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8460,5,8463,6,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+%23setVerboseLoggingEnabled%28boolean%29%7D+instead.%22
 Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,206,5,206,69,publicAlternatives=%22%7B%40link+%23getBytes%28%29%7D%22
 Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,214,5,214,99,publicAlternatives=%22%7B%40link+android.net.wifi.WifiManager%23UNKNOWN_SSID%7D%22
 Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,222,5,222,76,publicAlternatives=%22%7B%40link+%23fromBytes%28byte%5B%5D%29%7D%22
@@ -169,69 +169,73 @@
 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
 Lcom/android/wifi/flags/CustomFeatureFlags;->androidVWifiApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,21,5,21,25,
 Lcom/android/wifi/flags/CustomFeatureFlags;->anqpRequestWaitForResponse()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,28,5,28,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->d2dWhenInfraStaOff()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,35,5,35,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->delaySaveToStore()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,42,5,42,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->delayedCarrierNetworkSelection()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,49,5,49,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->getBssidBlocklistApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,56,5,56,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->getChannelWidthApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,63,5,63,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->localOnlyConnectionOptimization()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,70,5,70,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->networkProviderBatteryChargingStatus()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,77,5,77,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->newUriParsingForEscapeCharacter()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,84,5,84,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->p2pOwnership()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,91,5,91,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->rsnOverriding()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,98,5,98,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->sharedConnectivityBroadcastReceiverTestApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,105,5,105,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->singleWifiThread()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,112,5,112,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->softapConfigStoreMaxChannelWidth()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,119,5,119,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->testFlagFunction()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,126,5,126,25,
-Lcom/android/wifi/flags/CustomFeatureFlags;->voipDetectionBugfix()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,133,5,133,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->awarePairing()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,35,5,35,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->d2dWhenInfraStaOff()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,42,5,42,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->delaySaveToStore()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,49,5,49,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->delayedCarrierNetworkSelection()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,56,5,56,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->getBssidBlocklistApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,63,5,63,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->getChannelWidthApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,70,5,70,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->localOnlyConnectionOptimization()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,77,5,77,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->networkProviderBatteryChargingStatus()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,84,5,84,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->newUriParsingForEscapeCharacter()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,91,5,91,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->p2pOwnership()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,98,5,98,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->rsnOverriding()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,105,5,105,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->sharedConnectivityBroadcastReceiverTestApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,112,5,112,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->singleWifiThread()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,119,5,119,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->softapConfigStoreMaxChannelWidth()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,126,5,126,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->testFlagFunction()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,133,5,133,25,
+Lcom/android/wifi/flags/CustomFeatureFlags;->voipDetectionBugfix()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/CustomFeatureFlags.java,140,5,140,25,
 Lcom/android/wifi/flags/FeatureFlags;->androidVWifiApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,9,5,9,25,
 Lcom/android/wifi/flags/FeatureFlags;->anqpRequestWaitForResponse()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,13,5,13,25,
-Lcom/android/wifi/flags/FeatureFlags;->d2dWhenInfraStaOff()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,17,5,17,25,
-Lcom/android/wifi/flags/FeatureFlags;->delaySaveToStore()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,21,5,21,25,
-Lcom/android/wifi/flags/FeatureFlags;->delayedCarrierNetworkSelection()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,25,5,25,25,
-Lcom/android/wifi/flags/FeatureFlags;->getBssidBlocklistApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,29,5,29,25,
-Lcom/android/wifi/flags/FeatureFlags;->getChannelWidthApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,33,5,33,25,
-Lcom/android/wifi/flags/FeatureFlags;->localOnlyConnectionOptimization()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,37,5,37,25,
-Lcom/android/wifi/flags/FeatureFlags;->networkProviderBatteryChargingStatus()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,41,5,41,25,
-Lcom/android/wifi/flags/FeatureFlags;->newUriParsingForEscapeCharacter()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,45,5,45,25,
-Lcom/android/wifi/flags/FeatureFlags;->p2pOwnership()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,49,5,49,25,
-Lcom/android/wifi/flags/FeatureFlags;->rsnOverriding()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,53,5,53,25,
-Lcom/android/wifi/flags/FeatureFlags;->sharedConnectivityBroadcastReceiverTestApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,57,5,57,25,
-Lcom/android/wifi/flags/FeatureFlags;->singleWifiThread()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,61,5,61,25,
-Lcom/android/wifi/flags/FeatureFlags;->softapConfigStoreMaxChannelWidth()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,65,5,65,25,
-Lcom/android/wifi/flags/FeatureFlags;->testFlagFunction()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,69,5,69,25,
-Lcom/android/wifi/flags/FeatureFlags;->voipDetectionBugfix()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,73,5,73,25,
+Lcom/android/wifi/flags/FeatureFlags;->awarePairing()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,17,5,17,25,
+Lcom/android/wifi/flags/FeatureFlags;->d2dWhenInfraStaOff()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,21,5,21,25,
+Lcom/android/wifi/flags/FeatureFlags;->delaySaveToStore()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,25,5,25,25,
+Lcom/android/wifi/flags/FeatureFlags;->delayedCarrierNetworkSelection()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,29,5,29,25,
+Lcom/android/wifi/flags/FeatureFlags;->getBssidBlocklistApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,33,5,33,25,
+Lcom/android/wifi/flags/FeatureFlags;->getChannelWidthApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,37,5,37,25,
+Lcom/android/wifi/flags/FeatureFlags;->localOnlyConnectionOptimization()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,41,5,41,25,
+Lcom/android/wifi/flags/FeatureFlags;->networkProviderBatteryChargingStatus()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,45,5,45,25,
+Lcom/android/wifi/flags/FeatureFlags;->newUriParsingForEscapeCharacter()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,49,5,49,25,
+Lcom/android/wifi/flags/FeatureFlags;->p2pOwnership()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,53,5,53,25,
+Lcom/android/wifi/flags/FeatureFlags;->rsnOverriding()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,57,5,57,25,
+Lcom/android/wifi/flags/FeatureFlags;->sharedConnectivityBroadcastReceiverTestApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,61,5,61,25,
+Lcom/android/wifi/flags/FeatureFlags;->singleWifiThread()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,65,5,65,25,
+Lcom/android/wifi/flags/FeatureFlags;->softapConfigStoreMaxChannelWidth()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,69,5,69,25,
+Lcom/android/wifi/flags/FeatureFlags;->testFlagFunction()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,73,5,73,25,
+Lcom/android/wifi/flags/FeatureFlags;->voipDetectionBugfix()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlags.java,77,5,77,25,
 Lcom/android/wifi/flags/FeatureFlagsImpl;->androidVWifiApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,8,5,8,25,
 Lcom/android/wifi/flags/FeatureFlagsImpl;->anqpRequestWaitForResponse()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,15,5,15,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->d2dWhenInfraStaOff()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,22,5,22,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->delaySaveToStore()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,29,5,29,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->delayedCarrierNetworkSelection()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,36,5,36,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->getBssidBlocklistApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,43,5,43,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->getChannelWidthApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,50,5,50,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->localOnlyConnectionOptimization()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,57,5,57,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->networkProviderBatteryChargingStatus()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,64,5,64,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->newUriParsingForEscapeCharacter()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,71,5,71,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->p2pOwnership()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,78,5,78,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->rsnOverriding()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,85,5,85,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->sharedConnectivityBroadcastReceiverTestApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,92,5,92,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->singleWifiThread()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,99,5,99,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->softapConfigStoreMaxChannelWidth()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,106,5,106,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->testFlagFunction()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,113,5,113,25,
-Lcom/android/wifi/flags/FeatureFlagsImpl;->voipDetectionBugfix()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,120,5,120,25,
-Lcom/android/wifi/flags/Flags;->androidVWifiApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,42,5,42,25,
-Lcom/android/wifi/flags/Flags;->anqpRequestWaitForResponse()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,48,5,48,25,
-Lcom/android/wifi/flags/Flags;->d2dWhenInfraStaOff()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,54,5,54,25,
-Lcom/android/wifi/flags/Flags;->delaySaveToStore()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,60,5,60,25,
-Lcom/android/wifi/flags/Flags;->delayedCarrierNetworkSelection()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,66,5,66,25,
-Lcom/android/wifi/flags/Flags;->getBssidBlocklistApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,72,5,72,25,
-Lcom/android/wifi/flags/Flags;->getChannelWidthApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,78,5,78,25,
-Lcom/android/wifi/flags/Flags;->localOnlyConnectionOptimization()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,84,5,84,25,
-Lcom/android/wifi/flags/Flags;->networkProviderBatteryChargingStatus()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,90,5,90,25,
-Lcom/android/wifi/flags/Flags;->newUriParsingForEscapeCharacter()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,96,5,96,25,
-Lcom/android/wifi/flags/Flags;->p2pOwnership()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,102,5,102,25,
-Lcom/android/wifi/flags/Flags;->rsnOverriding()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,108,5,108,25,
-Lcom/android/wifi/flags/Flags;->sharedConnectivityBroadcastReceiverTestApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,114,5,114,25,
-Lcom/android/wifi/flags/Flags;->singleWifiThread()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,120,5,120,25,
-Lcom/android/wifi/flags/Flags;->softapConfigStoreMaxChannelWidth()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,126,5,126,25,
-Lcom/android/wifi/flags/Flags;->testFlagFunction()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,132,5,132,25,
-Lcom/android/wifi/flags/Flags;->voipDetectionBugfix()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,138,5,138,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->awarePairing()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,22,5,22,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->d2dWhenInfraStaOff()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,29,5,29,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->delaySaveToStore()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,36,5,36,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->delayedCarrierNetworkSelection()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,43,5,43,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->getBssidBlocklistApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,50,5,50,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->getChannelWidthApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,57,5,57,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->localOnlyConnectionOptimization()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,64,5,64,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->networkProviderBatteryChargingStatus()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,71,5,71,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->newUriParsingForEscapeCharacter()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,78,5,78,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->p2pOwnership()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,85,5,85,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->rsnOverriding()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,92,5,92,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->sharedConnectivityBroadcastReceiverTestApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,99,5,99,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->singleWifiThread()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,106,5,106,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->softapConfigStoreMaxChannelWidth()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,113,5,113,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->testFlagFunction()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,120,5,120,25,
+Lcom/android/wifi/flags/FeatureFlagsImpl;->voipDetectionBugfix()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/FeatureFlagsImpl.java,127,5,127,25,
+Lcom/android/wifi/flags/Flags;->androidVWifiApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,44,5,44,25,
+Lcom/android/wifi/flags/Flags;->anqpRequestWaitForResponse()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,50,5,50,25,
+Lcom/android/wifi/flags/Flags;->awarePairing()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,56,5,56,25,
+Lcom/android/wifi/flags/Flags;->d2dWhenInfraStaOff()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,62,5,62,25,
+Lcom/android/wifi/flags/Flags;->delaySaveToStore()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,68,5,68,25,
+Lcom/android/wifi/flags/Flags;->delayedCarrierNetworkSelection()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,74,5,74,25,
+Lcom/android/wifi/flags/Flags;->getBssidBlocklistApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,80,5,80,25,
+Lcom/android/wifi/flags/Flags;->getChannelWidthApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,86,5,86,25,
+Lcom/android/wifi/flags/Flags;->localOnlyConnectionOptimization()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,92,5,92,25,
+Lcom/android/wifi/flags/Flags;->networkProviderBatteryChargingStatus()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,98,5,98,25,
+Lcom/android/wifi/flags/Flags;->newUriParsingForEscapeCharacter()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,104,5,104,25,
+Lcom/android/wifi/flags/Flags;->p2pOwnership()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,110,5,110,25,
+Lcom/android/wifi/flags/Flags;->rsnOverriding()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,116,5,116,25,
+Lcom/android/wifi/flags/Flags;->sharedConnectivityBroadcastReceiverTestApi()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,122,5,122,25,
+Lcom/android/wifi/flags/Flags;->singleWifiThread()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,128,5,128,25,
+Lcom/android/wifi/flags/Flags;->softapConfigStoreMaxChannelWidth()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,134,5,134,25,
+Lcom/android/wifi/flags/Flags;->testFlagFunction()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,140,5,140,25,
+Lcom/android/wifi/flags/Flags;->voipDetectionBugfix()Z,out/soong/.intermediates/packages/modules/Wifi/framework/framework-wifi.impl/android_common_apex30/javac/srcjars/com/android/wifi/flags/Flags.java,146,5,146,25,
diff --git a/current/sdk_library/module-lib/framework-wifi-stubs.jar b/current/sdk_library/module-lib/framework-wifi-stubs.jar
index efa1ad6..a440930 100644
--- a/current/sdk_library/module-lib/framework-wifi-stubs.jar
+++ b/current/sdk_library/module-lib/framework-wifi-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-wifi.srcjar b/current/sdk_library/module-lib/framework-wifi.srcjar
index d764d69..a069532 100644
--- a/current/sdk_library/module-lib/framework-wifi.srcjar
+++ b/current/sdk_library/module-lib/framework-wifi.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-wifi-stubs.jar b/current/sdk_library/public/framework-wifi-stubs.jar
index 07732d3..4c9e13a 100644
--- a/current/sdk_library/public/framework-wifi-stubs.jar
+++ b/current/sdk_library/public/framework-wifi-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/framework-wifi.srcjar b/current/sdk_library/public/framework-wifi.srcjar
index 9fe14bf..6d84a32 100644
--- a/current/sdk_library/public/framework-wifi.srcjar
+++ b/current/sdk_library/public/framework-wifi.srcjar
Binary files differ
diff --git a/current/sdk_library/system/framework-wifi-stubs.jar b/current/sdk_library/system/framework-wifi-stubs.jar
index 0f493d9..ad79dde 100644
--- a/current/sdk_library/system/framework-wifi-stubs.jar
+++ b/current/sdk_library/system/framework-wifi-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system/framework-wifi.srcjar b/current/sdk_library/system/framework-wifi.srcjar
index 4c25d5e..0acdecf 100644
--- a/current/sdk_library/system/framework-wifi.srcjar
+++ b/current/sdk_library/system/framework-wifi.srcjar
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 7f050b1..693b250 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12275840
\ No newline at end of file
+12665740
\ No newline at end of file