Merge cherrypicks of ['googleplex-android-review.googlesource.com/26049085', 'googleplex-android-review.googlesource.com/26051900'] 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: I1675be83084d20a8ae18b61b2b74da212108d23c

58 files changed, 160 insertions, 606 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 0705553..8a47752 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: "P65184093"
-    target: "mainline_modules_sdks-trunk-userdebug"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.tethering/sdk/tethering-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 fec8705..617707a 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: "P65184092"
-    target: "mainline_go_modules_sdks-trunk-userdebug"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.tethering/sdk/tethering-module-sdk-current.zip"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.tethering/sdk/tethering-module-sdk-current.zip"
   }
   dest_file: "go/current/current.zip"
   version: ""
diff --git a/current/arm/lib/libcom.android.tethering.dns_helper.so b/current/arm/lib/libcom.android.tethering.dns_helper.so
index d1d09b5..8fcaecf 100755
--- a/current/arm/lib/libcom.android.tethering.dns_helper.so
+++ b/current/arm/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/arm/lib/libnetd_updatable.so b/current/arm/lib/libnetd_updatable.so
index ebcc329..1109346 100755
--- a/current/arm/lib/libnetd_updatable.so
+++ b/current/arm/lib/libnetd_updatable.so
diff --git a/current/arm64/lib/libcom.android.tethering.dns_helper.so b/current/arm64/lib/libcom.android.tethering.dns_helper.so
index 694fe43..e93da4b 100755
--- a/current/arm64/lib/libcom.android.tethering.dns_helper.so
+++ b/current/arm64/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/arm64/lib/libnetd_updatable.so b/current/arm64/lib/libnetd_updatable.so
index 172fdc6..38181e1 100755
--- a/current/arm64/lib/libnetd_updatable.so
+++ b/current/arm64/lib/libnetd_updatable.so
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index bb198e5..48d04b3 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -806,16 +806,16 @@ Landroid/net/DhcpOption$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Obje
 Landroid/net/DhcpOption$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/DhcpOption;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/DhcpOption;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->onCancel()V,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->onCancel()V,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onCancel()V,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda7;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->onCancel()V,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onAnswer(Ljava/lang/Object;I)V,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onError(Landroid/net/DnsResolver$DnsException;)V,public-api,sdk,system-api,test-api
@@ -1721,11 +1721,6 @@ Landroid/net/LinkProperties;->setUsePrivateDns(Z)V,sdk,system-api,test-api
 Landroid/net/LinkProperties;->setValidatedPrivateDnsServers(Ljava/util/Collection;)V,sdk,system-api,test-api
 Landroid/net/LinkProperties;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/LinkProperties;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/MacAddress$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/MacAddress$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/MacAddress;-><init>(J)V,lo-prio,max-target-o
@@ -1814,7 +1809,7 @@ Landroid/net/Network;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,pu
 Landroid/net/Network;->openConnection(Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;,public-api,sdk,system-api,test-api
 Landroid/net/Network;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/Network;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/NetworkAgent$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkAgent$$ExternalSyntheticLambda17;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkAgent$NetworkAgentHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;ILandroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,sdk,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;Landroid/net/NetworkScore;Landroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,sdk,system-api,test-api
@@ -2272,12 +2267,12 @@ Landroid/net/NetworkStateSnapshot;->equals(Ljava/lang/Object;)Z,core-platform-ap
 Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$$ExternalSyntheticLambda6;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$1;->hasNext()Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$1;->next()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
@@ -2822,7 +2817,7 @@ Landroid/net/TetheringInterface;->getType()I,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-api,sdk,system-api,test-api
@@ -3171,7 +3166,6 @@ Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-pl
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write([CII)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/com/android/internal/util/FileRotator$$ExternalSyntheticLambda0;->applyAsLong(Ljava/lang/Object;)J,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava/time/ZoneId;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,sdk,system-api,test-api
@@ -3952,9 +3946,9 @@ Landroid/net/nsd/INsdManager$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-ta
 Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/nsd/INsdManager;,lo-prio,max-target-r
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceFound(Landroid/net/nsd/NsdServiceInfo;)V,public-api,sdk,system-api,test-api
@@ -4138,84 +4132,25 @@ Landroid/net/nsd/OffloadServiceInfo;->toString()Ljava/lang/String;,core-platform
 Landroid/net/nsd/OffloadServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;-><init>()V,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;-><init>(Landroid/net/thread/ActiveOperationalDataset;)V,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->build()Landroid/net/thread/ActiveOperationalDataset;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setActiveTimestamp(Landroid/net/thread/OperationalDatasetTimestamp;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setChannel(II)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setChannelMask(Landroid/util/SparseArray;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setExtendedPanId([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setMeshLocalPrefix(Landroid/net/IpPrefix;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setNetworkKey([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setNetworkName(Ljava/lang/String;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setPanId(I)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setPskc([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setSecurityPolicy(Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;-><init>(I[B)V,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->DEFAULT_ROTATION_TIME_HOURS:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->LENGTH_MIN_SECURITY_POLICY_FLAGS:I,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->getFlags()[B,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->getRotationTimeHours()I,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_MAX_24_GHZ:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_MIN_24_GHZ:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_PAGE_24_GHZ:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_EXTENDED_PAN_ID:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MAX_DATASET_TLVS:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MAX_NETWORK_NAME_BYTES:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MESH_LOCAL_PREFIX_BITS:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MIN_NETWORK_NAME_BYTES:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_NETWORK_KEY:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_PSKC:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->createRandomDataset()Landroid/net/thread/ActiveOperationalDataset;,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->fromThreadTlvs([B)Landroid/net/thread/ActiveOperationalDataset;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getActiveTimestamp()Landroid/net/thread/OperationalDatasetTimestamp;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannel()I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannelMask()Landroid/util/SparseArray;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannelPage()I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getExtendedPanId()[B,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getMeshLocalPrefix()Landroid/net/IpPrefix;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getNetworkKey()[B,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getNetworkName()Ljava/lang/String;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getPanId()I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getPskc()[B,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getSecurityPolicy()Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->toThreadTlvs()[B,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;-><init>(JIZ)V,sdk,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->fromInstant(Ljava/time/Instant;)Landroid/net/thread/OperationalDatasetTimestamp;,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->getSeconds()J,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->getTicks()I,sdk,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->isAuthoritativeSource()Z,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->toInstant()Ljava/time/Instant;,sdk,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;-><init>(Landroid/net/thread/ActiveOperationalDataset;Landroid/net/thread/OperationalDatasetTimestamp;Ljava/time/Duration;)V,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->fromThreadTlvs([B)Landroid/net/thread/PendingOperationalDataset;,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getActiveOperationalDataset()Landroid/net/thread/ActiveOperationalDataset;,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getDelayTimer()Ljava/time/Duration;,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getPendingTimestamp()Landroid/net/thread/OperationalDatasetTimestamp;,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->toThreadTlvs()[B,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/thread/ThreadNetworkController;->THREAD_VERSION_1_3:I,sdk,system-api,test-api
-Landroid/net/thread/ThreadNetworkController;->getThreadVersion()I,sdk,system-api,test-api
 Landroid/net/thread/ThreadNetworkManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ThreadNetworkManager;->getAllThreadNetworkControllers()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index edb423a..dcee496 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -562,16 +562,16 @@ Landroid/net/DhcpOption$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Obje
 Landroid/net/DhcpOption$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/DhcpOption;->describeContents()I,public-api,system-api,test-api
 Landroid/net/DhcpOption;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->onCancel()V,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->onCancel()V,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onCancel()V,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda7;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->onCancel()V,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onAnswer(Ljava/lang/Object;I)V,public-api,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onError(Landroid/net/DnsResolver$DnsException;)V,public-api,system-api,test-api
@@ -957,11 +957,6 @@ Landroid/net/LinkProperties;->setUsePrivateDns(Z)V,system-api,test-api
 Landroid/net/LinkProperties;->setValidatedPrivateDnsServers(Ljava/util/Collection;)V,system-api,test-api
 Landroid/net/LinkProperties;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/LinkProperties;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo;->describeContents()I,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/MacAddress$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/MacAddress$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/MacAddress;->BROADCAST_ADDRESS:Landroid/net/MacAddress;,public-api,system-api,test-api
@@ -1017,7 +1012,7 @@ Landroid/net/Network;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,pu
 Landroid/net/Network;->openConnection(Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;,public-api,system-api,test-api
 Landroid/net/Network;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/Network;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/NetworkAgent$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkAgent$$ExternalSyntheticLambda17;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkAgent$NetworkAgentHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;ILandroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;Landroid/net/NetworkScore;Landroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,system-api,test-api
@@ -1310,12 +1305,12 @@ Landroid/net/NetworkStateSnapshot;->equals(Ljava/lang/Object;)Z,core-platform-ap
 Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$$ExternalSyntheticLambda6;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$1;->hasNext()Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$1;->next()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
@@ -1610,7 +1605,7 @@ Landroid/net/TetheringInterface;->getType()I,system-api,test-api
 Landroid/net/TetheringInterface;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringInterface;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringInterface;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-api,system-api,test-api
@@ -1920,7 +1915,6 @@ Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-pl
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write([CII)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/com/android/internal/util/FileRotator$$ExternalSyntheticLambda0;->applyAsLong(Ljava/lang/Object;)J,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava/time/ZoneId;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,system-api,test-api
@@ -2680,9 +2674,9 @@ Landroid/net/nsd/INsdManager$Default;->asBinder()Landroid/os/IBinder;,public-api
 Landroid/net/nsd/INsdManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceFound(Landroid/net/nsd/NsdServiceInfo;)V,public-api,system-api,test-api
@@ -2821,84 +2815,25 @@ Landroid/net/nsd/OffloadServiceInfo;->toString()Ljava/lang/String;,core-platform
 Landroid/net/nsd/OffloadServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;-><init>()V,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;-><init>(Landroid/net/thread/ActiveOperationalDataset;)V,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->build()Landroid/net/thread/ActiveOperationalDataset;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setActiveTimestamp(Landroid/net/thread/OperationalDatasetTimestamp;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setChannel(II)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setChannelMask(Landroid/util/SparseArray;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setExtendedPanId([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setMeshLocalPrefix(Landroid/net/IpPrefix;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setNetworkKey([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setNetworkName(Ljava/lang/String;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setPanId(I)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setPskc([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setSecurityPolicy(Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;-><init>(I[B)V,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->DEFAULT_ROTATION_TIME_HOURS:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->LENGTH_MIN_SECURITY_POLICY_FLAGS:I,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->getFlags()[B,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->getRotationTimeHours()I,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_MAX_24_GHZ:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_MIN_24_GHZ:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_PAGE_24_GHZ:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_EXTENDED_PAN_ID:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MAX_DATASET_TLVS:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MAX_NETWORK_NAME_BYTES:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MESH_LOCAL_PREFIX_BITS:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MIN_NETWORK_NAME_BYTES:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_NETWORK_KEY:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_PSKC:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->createRandomDataset()Landroid/net/thread/ActiveOperationalDataset;,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->describeContents()I,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->fromThreadTlvs([B)Landroid/net/thread/ActiveOperationalDataset;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getActiveTimestamp()Landroid/net/thread/OperationalDatasetTimestamp;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannel()I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannelMask()Landroid/util/SparseArray;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannelPage()I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getExtendedPanId()[B,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getMeshLocalPrefix()Landroid/net/IpPrefix;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getNetworkKey()[B,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getNetworkName()Ljava/lang/String;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getPanId()I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getPskc()[B,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getSecurityPolicy()Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->toThreadTlvs()[B,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;-><init>(JIZ)V,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->fromInstant(Ljava/time/Instant;)Landroid/net/thread/OperationalDatasetTimestamp;,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->getSeconds()J,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->getTicks()I,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->hashCode()I,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->isAuthoritativeSource()Z,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->toInstant()Ljava/time/Instant;,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;-><init>(Landroid/net/thread/ActiveOperationalDataset;Landroid/net/thread/OperationalDatasetTimestamp;Ljava/time/Duration;)V,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->describeContents()I,public-api,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->fromThreadTlvs([B)Landroid/net/thread/PendingOperationalDataset;,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getActiveOperationalDataset()Landroid/net/thread/ActiveOperationalDataset;,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getDelayTimer()Ljava/time/Duration;,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getPendingTimestamp()Landroid/net/thread/OperationalDatasetTimestamp;,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->toThreadTlvs()[B,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/thread/ThreadNetworkController;->THREAD_VERSION_1_3:I,system-api,test-api
-Landroid/net/thread/ThreadNetworkController;->getThreadVersion()I,system-api,test-api
 Landroid/net/thread/ThreadNetworkManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ThreadNetworkManager;->getAllThreadNetworkControllers()Ljava/util/List;,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index dd0f1d9..35d40b8 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,50 +1,50 @@
 signature,file,startline,startcol,endline,endcol,properties
 Landroid/app/usage/NetworkStatsManager;->setPollForce(Z)V,packages/modules/Connectivity/framework-t/src/android/app/usage/NetworkStatsManager.java,203,5,203,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2348,9,2348,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2272,9,2272,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2276,9,2276,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2281,9,2281,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2286,9,2286,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,380,5,380,25,
-Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,395,5,395,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,404,5,404,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,419,5,419,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_ERRORED_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,428,5,428,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,692,5,692,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,701,5,701,25,
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,710,5,710,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,729,5,729,25,
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,739,5,739,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,976,5,976,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1175,5,1175,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1244,5,1244,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1616,5,1616,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1735,5,1735,25,
-Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1772,5,1772,25,
-Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1796,5,1796,88,maxTargetSdk=28&trackingBug=109783091L
-Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1821,5,1821,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2058,5,2058,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2144,5,2144,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2173,5,2173,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2203,5,2203,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2449,5,2449,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2649,5,2649,25,
-Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2703,5,2703,25,
-Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2713,5,2713,25,
-Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2840,5,2840,25,
-Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2885,5,2885,25,
-Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2903,5,2903,25,
-Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2918,5,2918,25,
-Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2939,5,2939,25,
-Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2983,5,2983,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3007,5,3007,25,
-Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3245,5,3245,25,
-Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3263,5,3263,25,
-Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3282,5,3282,25,
-Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3306,5,3306,25,
-Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3422,5,3422,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3671,5,3671,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5514,5,5514,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2322,9,2322,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2246,9,2246,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2250,9,2250,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2255,9,2255,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2260,9,2260,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,376,5,376,25,
+Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,391,5,391,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,400,5,400,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,415,5,415,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ERRORED_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,424,5,424,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,688,5,688,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,697,5,697,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,706,5,706,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,725,5,725,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,735,5,735,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,961,5,961,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1149,5,1149,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1218,5,1218,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1590,5,1590,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1709,5,1709,25,
+Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1746,5,1746,25,
+Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1770,5,1770,88,maxTargetSdk=28&trackingBug=109783091L
+Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1795,5,1795,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2032,5,2032,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2118,5,2118,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2147,5,2147,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2177,5,2177,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2423,5,2423,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2623,5,2623,25,
+Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2677,5,2677,25,
+Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2687,5,2687,25,
+Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2814,5,2814,25,
+Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2859,5,2859,25,
+Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2877,5,2877,25,
+Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2892,5,2892,25,
+Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2913,5,2913,25,
+Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2957,5,2957,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2981,5,2981,25,
+Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3219,5,3219,25,
+Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3237,5,3237,25,
+Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3256,5,3256,25,
+Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3280,5,3280,25,
+Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3396,5,3396,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3645,5,3645,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5460,5,5460,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/EthernetManager$Listener;->onAvailabilityChanged(Ljava/lang/String;Z)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,165,9,165,92,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/EthernetManager;->getConfiguration(Ljava/lang/String;)Landroid/net/IpConfiguration;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,192,5,192,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/EthernetManager;->setConfiguration(Ljava/lang/String;Landroid/net/IpConfiguration;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,205,5,205,88,maxTargetSdk=30&trackingBug=170729553L
@@ -103,7 +103,7 @@ Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkPropertie
 Landroid/net/MacAddress;->ALL_ZEROS_ADDRESS:Landroid/net/MacAddress;,packages/modules/Connectivity/framework/src/android/net/MacAddress.java,62,5,62,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/Network;->netId:I,packages/modules/Connectivity/framework/src/android/net/Network.java,69,5,69,25,
 Landroid/net/Network;-><init>(I)V,packages/modules/Connectivity/framework/src/android/net/Network.java,115,5,115,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java,1115,5,1115,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java,1124,5,1124,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,409,5,409,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1813,5,1813,63,maxTargetSdk=28
 Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1839,5,1839,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index 92318cc..d1cd51a 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -69,7 +69,6 @@ android/net/IpSecUdpEncapResponse
 android/net/KeepalivePacketData
 android/net/LinkAddress
 android/net/LinkProperties
-android/net/LocalNetworkInfo
 android/net/MacAddress
 android/net/NattKeepalivePacketData
 android/net/Network
diff --git a/current/sdk_library/module-lib/framework-connectivity-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-stubs.jar
index c024370..fe3b15f 100644
--- a/current/sdk_library/module-lib/framework-connectivity-stubs.jar
+++ b/current/sdk_library/module-lib/framework-connectivity-stubs.jar
diff --git a/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
index 3ddfb53..e72e6fc 100644
--- a/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
+++ b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
diff --git a/current/sdk_library/module-lib/framework-connectivity-t.srcjar b/current/sdk_library/module-lib/framework-connectivity-t.srcjar
index 3565691..6f1f565 100644
--- a/current/sdk_library/module-lib/framework-connectivity-t.srcjar
+++ b/current/sdk_library/module-lib/framework-connectivity-t.srcjar
diff --git a/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip b/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
index 01e6d1d..fa0b655 100644
--- a/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
+++ b/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
diff --git a/current/sdk_library/module-lib/framework-connectivity.srcjar b/current/sdk_library/module-lib/framework-connectivity.srcjar
index 2b53cf1..1d3849d 100644
--- a/current/sdk_library/module-lib/framework-connectivity.srcjar
+++ b/current/sdk_library/module-lib/framework-connectivity.srcjar
diff --git a/current/sdk_library/module-lib/framework-connectivity.txt b/current/sdk_library/module-lib/framework-connectivity.txt
index bfb4981..193bd92 100644
--- a/current/sdk_library/module-lib/framework-connectivity.txt
+++ b/current/sdk_library/module-lib/framework-connectivity.txt
@@ -14,7 +14,6 @@ package android.net {
     method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange();
     method @Nullable @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public android.net.LinkProperties getRedactedLinkPropertiesForPackage(@NonNull android.net.LinkProperties, int, @NonNull String);
     method @Nullable @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public android.net.NetworkCapabilities getRedactedNetworkCapabilitiesForPackage(@NonNull android.net.NetworkCapabilities, int, @NonNull String);
-    method @FlaggedApi("com.android.net.flags.support_is_uid_networking_blocked") @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public boolean isUidNetworkingBlocked(int, boolean);
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerDefaultNetworkCallbackForUid(int, @NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS}) public void registerSystemDefaultNetworkCallback(@NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void removeUidFromMeteredNetworkAllowList(int);
@@ -25,7 +24,6 @@ package android.net {
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAcceptPartialConnectivity(@NonNull android.net.Network, boolean, boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAcceptUnvalidated(@NonNull android.net.Network, boolean, boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAvoidUnvalidated(@NonNull android.net.Network);
-    method @FlaggedApi("com.android.net.flags.set_data_saver_via_cm") @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setDataSaverEnabled(boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setFirewallChainEnabled(int, boolean);
     method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setGlobalProxy(@Nullable android.net.ProxyInfo);
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void setLegacyLockdownVpnEnabled(boolean);
@@ -45,7 +43,6 @@ package android.net {
     field public static final int BLOCKED_METERED_REASON_DATA_SAVER = 65536; // 0x10000
     field public static final int BLOCKED_METERED_REASON_MASK = -65536; // 0xffff0000
     field public static final int BLOCKED_METERED_REASON_USER_RESTRICTED = 131072; // 0x20000
-    field @FlaggedApi("com.android.net.flags.basic_background_restrictions_enabled") public static final int BLOCKED_REASON_APP_BACKGROUND = 64; // 0x40
     field public static final int BLOCKED_REASON_APP_STANDBY = 4; // 0x4
     field public static final int BLOCKED_REASON_BATTERY_SAVER = 1; // 0x1
     field public static final int BLOCKED_REASON_DOZE = 2; // 0x2
@@ -53,7 +50,6 @@ package android.net {
     field public static final int BLOCKED_REASON_LOW_POWER_STANDBY = 32; // 0x20
     field public static final int BLOCKED_REASON_NONE = 0; // 0x0
     field public static final int BLOCKED_REASON_RESTRICTED_MODE = 8; // 0x8
-    field @FlaggedApi("com.android.net.flags.basic_background_restrictions_enabled") public static final int FIREWALL_CHAIN_BACKGROUND = 6; // 0x6
     field public static final int FIREWALL_CHAIN_DOZABLE = 1; // 0x1
     field public static final int FIREWALL_CHAIN_LOW_POWER_STANDBY = 5; // 0x5
     field public static final int FIREWALL_CHAIN_OEM_DENY_1 = 7; // 0x7
diff --git a/current/sdk_library/module-lib/framework-connectivity_annotations.zip b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
index df9140d..cb77f5c 100644
--- a/current/sdk_library/module-lib/framework-connectivity_annotations.zip
+++ b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
diff --git a/current/sdk_library/public/framework-connectivity-stubs.jar b/current/sdk_library/public/framework-connectivity-stubs.jar
index 30b9edf..6508e5f 100644
--- a/current/sdk_library/public/framework-connectivity-stubs.jar
+++ b/current/sdk_library/public/framework-connectivity-stubs.jar
diff --git a/current/sdk_library/public/framework-connectivity-t-stubs.jar b/current/sdk_library/public/framework-connectivity-t-stubs.jar
index f47fb98..b4d1537 100644
--- a/current/sdk_library/public/framework-connectivity-t-stubs.jar
+++ b/current/sdk_library/public/framework-connectivity-t-stubs.jar
diff --git a/current/sdk_library/public/framework-connectivity-t.srcjar b/current/sdk_library/public/framework-connectivity-t.srcjar
index f8f2d4c..e901215 100644
--- a/current/sdk_library/public/framework-connectivity-t.srcjar
+++ b/current/sdk_library/public/framework-connectivity-t.srcjar
diff --git a/current/sdk_library/public/framework-connectivity.srcjar b/current/sdk_library/public/framework-connectivity.srcjar
index 3061380..f0efae1 100644
--- a/current/sdk_library/public/framework-connectivity.srcjar
+++ b/current/sdk_library/public/framework-connectivity.srcjar
diff --git a/current/sdk_library/system/framework-connectivity-t-stubs.jar b/current/sdk_library/system/framework-connectivity-t-stubs.jar
index dca3093..4af91a1 100644
--- a/current/sdk_library/system/framework-connectivity-t-stubs.jar
+++ b/current/sdk_library/system/framework-connectivity-t-stubs.jar
diff --git a/current/sdk_library/system/framework-connectivity-t.srcjar b/current/sdk_library/system/framework-connectivity-t.srcjar
index 250df62..909fbd9 100644
--- a/current/sdk_library/system/framework-connectivity-t.srcjar
+++ b/current/sdk_library/system/framework-connectivity-t.srcjar
diff --git a/current/sdk_library/system/framework-connectivity-t.txt b/current/sdk_library/system/framework-connectivity-t.txt
index 23510e1..6f0119e 100644
--- a/current/sdk_library/system/framework-connectivity-t.txt
+++ b/current/sdk_library/system/framework-connectivity-t.txt
@@ -415,91 +415,3 @@ package android.net.nsd {
 
 }
 
-package android.net.thread {
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ActiveOperationalDataset implements android.os.Parcelable {
-    method @NonNull public static android.net.thread.ActiveOperationalDataset createRandomDataset();
-    method public int describeContents();
-    method @NonNull public static android.net.thread.ActiveOperationalDataset fromThreadTlvs(@NonNull byte[]);
-    method @NonNull public android.net.thread.OperationalDatasetTimestamp getActiveTimestamp();
-    method @IntRange(from=0, to=65535) public int getChannel();
-    method @NonNull @Size(min=1) public android.util.SparseArray<byte[]> getChannelMask();
-    method @IntRange(from=0, to=255) public int getChannelPage();
-    method @NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_EXTENDED_PAN_ID) public byte[] getExtendedPanId();
-    method @NonNull public android.net.IpPrefix getMeshLocalPrefix();
-    method @NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_NETWORK_KEY) public byte[] getNetworkKey();
-    method @NonNull @Size(min=android.net.thread.ActiveOperationalDataset.LENGTH_MIN_NETWORK_NAME_BYTES, max=android.net.thread.ActiveOperationalDataset.LENGTH_MAX_NETWORK_NAME_BYTES) public String getNetworkName();
-    method @IntRange(from=0, to=65534) public int getPanId();
-    method @NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_PSKC) public byte[] getPskc();
-    method @NonNull public android.net.thread.ActiveOperationalDataset.SecurityPolicy getSecurityPolicy();
-    method @NonNull public byte[] toThreadTlvs();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field public static final int CHANNEL_MAX_24_GHZ = 26; // 0x1a
-    field public static final int CHANNEL_MIN_24_GHZ = 11; // 0xb
-    field public static final int CHANNEL_PAGE_24_GHZ = 0; // 0x0
-    field @NonNull public static final android.os.Parcelable.Creator<android.net.thread.ActiveOperationalDataset> CREATOR;
-    field public static final int LENGTH_EXTENDED_PAN_ID = 8; // 0x8
-    field public static final int LENGTH_MAX_DATASET_TLVS = 254; // 0xfe
-    field public static final int LENGTH_MAX_NETWORK_NAME_BYTES = 16; // 0x10
-    field public static final int LENGTH_MESH_LOCAL_PREFIX_BITS = 64; // 0x40
-    field public static final int LENGTH_MIN_NETWORK_NAME_BYTES = 1; // 0x1
-    field public static final int LENGTH_NETWORK_KEY = 16; // 0x10
-    field public static final int LENGTH_PSKC = 16; // 0x10
-  }
-
-  public static final class ActiveOperationalDataset.Builder {
-    ctor public ActiveOperationalDataset.Builder(@NonNull android.net.thread.ActiveOperationalDataset);
-    ctor public ActiveOperationalDataset.Builder();
-    method @NonNull public android.net.thread.ActiveOperationalDataset build();
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setActiveTimestamp(@NonNull android.net.thread.OperationalDatasetTimestamp);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setChannel(@IntRange(from=0, to=255) int, @IntRange(from=0, to=65535) int);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setChannelMask(@NonNull @Size(min=1) android.util.SparseArray<byte[]>);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setExtendedPanId(@NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_EXTENDED_PAN_ID) byte[]);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setMeshLocalPrefix(@NonNull android.net.IpPrefix);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setNetworkKey(@NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_NETWORK_KEY) byte[]);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setNetworkName(@NonNull @Size(min=android.net.thread.ActiveOperationalDataset.LENGTH_MIN_NETWORK_NAME_BYTES, max=android.net.thread.ActiveOperationalDataset.LENGTH_MAX_NETWORK_NAME_BYTES) String);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setPanId(@IntRange(from=0, to=65534) int);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setPskc(@NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_PSKC) byte[]);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setSecurityPolicy(@NonNull android.net.thread.ActiveOperationalDataset.SecurityPolicy);
-  }
-
-  public static final class ActiveOperationalDataset.SecurityPolicy {
-    ctor public ActiveOperationalDataset.SecurityPolicy(@IntRange(from=1, to=65535) int, @NonNull @Size(min=android.net.thread.ActiveOperationalDataset.SecurityPolicy.LENGTH_MIN_SECURITY_POLICY_FLAGS) byte[]);
-    method @NonNull @Size(min=android.net.thread.ActiveOperationalDataset.SecurityPolicy.LENGTH_MIN_SECURITY_POLICY_FLAGS) public byte[] getFlags();
-    method @IntRange(from=1, to=65535) public int getRotationTimeHours();
-    field public static final int DEFAULT_ROTATION_TIME_HOURS = 672; // 0x2a0
-    field public static final int LENGTH_MIN_SECURITY_POLICY_FLAGS = 1; // 0x1
-  }
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class OperationalDatasetTimestamp {
-    ctor public OperationalDatasetTimestamp(@IntRange(from=0, to=281474976710655L) long, @IntRange(from=0, to=32767) int, boolean);
-    method @NonNull public static android.net.thread.OperationalDatasetTimestamp fromInstant(@NonNull java.time.Instant);
-    method @IntRange(from=0, to=281474976710655L) public long getSeconds();
-    method @IntRange(from=0, to=32767) public int getTicks();
-    method public boolean isAuthoritativeSource();
-    method @NonNull public java.time.Instant toInstant();
-  }
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class PendingOperationalDataset implements android.os.Parcelable {
-    ctor public PendingOperationalDataset(@NonNull android.net.thread.ActiveOperationalDataset, @NonNull android.net.thread.OperationalDatasetTimestamp, @NonNull java.time.Duration);
-    method public int describeContents();
-    method @NonNull public static android.net.thread.PendingOperationalDataset fromThreadTlvs(@NonNull byte[]);
-    method @NonNull public android.net.thread.ActiveOperationalDataset getActiveOperationalDataset();
-    method @NonNull public java.time.Duration getDelayTimer();
-    method @NonNull public android.net.thread.OperationalDatasetTimestamp getPendingTimestamp();
-    method @NonNull public byte[] toThreadTlvs();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.net.thread.PendingOperationalDataset> CREATOR;
-  }
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkController {
-    method public int getThreadVersion();
-    field public static final int THREAD_VERSION_1_3 = 4; // 0x4
-  }
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkManager {
-    method @NonNull public java.util.List<android.net.thread.ThreadNetworkController> getAllThreadNetworkControllers();
-  }
-
-}
-
diff --git a/current/sdk_library/system/framework-connectivity-t_annotations.zip b/current/sdk_library/system/framework-connectivity-t_annotations.zip
index 0271e30..fe86e53 100644
--- a/current/sdk_library/system/framework-connectivity-t_annotations.zip
+++ b/current/sdk_library/system/framework-connectivity-t_annotations.zip
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index a7e87e6..d038e1e 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-P65184093
\ No newline at end of file
+11212645
\ No newline at end of file
diff --git a/current/x86/lib/libcom.android.tethering.dns_helper.so b/current/x86/lib/libcom.android.tethering.dns_helper.so
index d95dc22..8a7b393 100755
--- a/current/x86/lib/libcom.android.tethering.dns_helper.so
+++ b/current/x86/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/x86/lib/libnetd_updatable.so b/current/x86/lib/libnetd_updatable.so
index b751dd0..422a5a2 100755
--- a/current/x86/lib/libnetd_updatable.so
+++ b/current/x86/lib/libnetd_updatable.so
diff --git a/current/x86_64/lib/libcom.android.tethering.dns_helper.so b/current/x86_64/lib/libcom.android.tethering.dns_helper.so
index 60c637a..65d6b0a 100755
--- a/current/x86_64/lib/libcom.android.tethering.dns_helper.so
+++ b/current/x86_64/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/x86_64/lib/libnetd_updatable.so b/current/x86_64/lib/libnetd_updatable.so
index a44538e..43be1bb 100755
--- a/current/x86_64/lib/libnetd_updatable.so
+++ b/current/x86_64/lib/libnetd_updatable.so
diff --git a/go/current/arm/lib/libcom.android.tethering.dns_helper.so b/go/current/arm/lib/libcom.android.tethering.dns_helper.so
index d1d09b5..8fcaecf 100755
--- a/go/current/arm/lib/libcom.android.tethering.dns_helper.so
+++ b/go/current/arm/lib/libcom.android.tethering.dns_helper.so
diff --git a/go/current/arm/lib/libnetd_updatable.so b/go/current/arm/lib/libnetd_updatable.so
index ebcc329..1109346 100755
--- a/go/current/arm/lib/libnetd_updatable.so
+++ b/go/current/arm/lib/libnetd_updatable.so
diff --git a/go/current/arm64/lib/libcom.android.tethering.dns_helper.so b/go/current/arm64/lib/libcom.android.tethering.dns_helper.so
index 694fe43..e93da4b 100755
--- a/go/current/arm64/lib/libcom.android.tethering.dns_helper.so
+++ b/go/current/arm64/lib/libcom.android.tethering.dns_helper.so
diff --git a/go/current/arm64/lib/libnetd_updatable.so b/go/current/arm64/lib/libnetd_updatable.so
index 172fdc6..38181e1 100755
--- a/go/current/arm64/lib/libnetd_updatable.so
+++ b/go/current/arm64/lib/libnetd_updatable.so
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index bb198e5..48d04b3 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -806,16 +806,16 @@ Landroid/net/DhcpOption$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Obje
 Landroid/net/DhcpOption$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/DhcpOption;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/DhcpOption;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->onCancel()V,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->onCancel()V,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onCancel()V,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda7;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->onCancel()V,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onAnswer(Ljava/lang/Object;I)V,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onError(Landroid/net/DnsResolver$DnsException;)V,public-api,sdk,system-api,test-api
@@ -1721,11 +1721,6 @@ Landroid/net/LinkProperties;->setUsePrivateDns(Z)V,sdk,system-api,test-api
 Landroid/net/LinkProperties;->setValidatedPrivateDnsServers(Ljava/util/Collection;)V,sdk,system-api,test-api
 Landroid/net/LinkProperties;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/LinkProperties;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/LocalNetworkInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/MacAddress$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/MacAddress$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/MacAddress;-><init>(J)V,lo-prio,max-target-o
@@ -1814,7 +1809,7 @@ Landroid/net/Network;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,pu
 Landroid/net/Network;->openConnection(Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;,public-api,sdk,system-api,test-api
 Landroid/net/Network;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/Network;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/NetworkAgent$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkAgent$$ExternalSyntheticLambda17;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkAgent$NetworkAgentHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;ILandroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,sdk,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;Landroid/net/NetworkScore;Landroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,sdk,system-api,test-api
@@ -2272,12 +2267,12 @@ Landroid/net/NetworkStateSnapshot;->equals(Ljava/lang/Object;)Z,core-platform-ap
 Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$$ExternalSyntheticLambda6;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$1;->hasNext()Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$1;->next()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
@@ -2822,7 +2817,7 @@ Landroid/net/TetheringInterface;->getType()I,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-api,sdk,system-api,test-api
@@ -3171,7 +3166,6 @@ Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-pl
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write([CII)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/com/android/internal/util/FileRotator$$ExternalSyntheticLambda0;->applyAsLong(Ljava/lang/Object;)J,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava/time/ZoneId;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,sdk,system-api,test-api
@@ -3952,9 +3946,9 @@ Landroid/net/nsd/INsdManager$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-ta
 Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/nsd/INsdManager;,lo-prio,max-target-r
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceFound(Landroid/net/nsd/NsdServiceInfo;)V,public-api,sdk,system-api,test-api
@@ -4138,84 +4132,25 @@ Landroid/net/nsd/OffloadServiceInfo;->toString()Ljava/lang/String;,core-platform
 Landroid/net/nsd/OffloadServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;-><init>()V,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;-><init>(Landroid/net/thread/ActiveOperationalDataset;)V,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->build()Landroid/net/thread/ActiveOperationalDataset;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setActiveTimestamp(Landroid/net/thread/OperationalDatasetTimestamp;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setChannel(II)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setChannelMask(Landroid/util/SparseArray;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setExtendedPanId([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setMeshLocalPrefix(Landroid/net/IpPrefix;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setNetworkKey([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setNetworkName(Ljava/lang/String;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setPanId(I)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setPskc([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setSecurityPolicy(Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;)Landroid/net/thread/ActiveOperationalDataset$Builder;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;-><init>(I[B)V,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->DEFAULT_ROTATION_TIME_HOURS:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->LENGTH_MIN_SECURITY_POLICY_FLAGS:I,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->getFlags()[B,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->getRotationTimeHours()I,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_MAX_24_GHZ:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_MIN_24_GHZ:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_PAGE_24_GHZ:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_EXTENDED_PAN_ID:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MAX_DATASET_TLVS:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MAX_NETWORK_NAME_BYTES:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MESH_LOCAL_PREFIX_BITS:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MIN_NETWORK_NAME_BYTES:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_NETWORK_KEY:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_PSKC:I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->createRandomDataset()Landroid/net/thread/ActiveOperationalDataset;,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->fromThreadTlvs([B)Landroid/net/thread/ActiveOperationalDataset;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getActiveTimestamp()Landroid/net/thread/OperationalDatasetTimestamp;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannel()I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannelMask()Landroid/util/SparseArray;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannelPage()I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getExtendedPanId()[B,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getMeshLocalPrefix()Landroid/net/IpPrefix;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getNetworkKey()[B,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getNetworkName()Ljava/lang/String;,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getPanId()I,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getPskc()[B,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getSecurityPolicy()Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->toThreadTlvs()[B,sdk,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;-><init>(JIZ)V,sdk,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->fromInstant(Ljava/time/Instant;)Landroid/net/thread/OperationalDatasetTimestamp;,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->getSeconds()J,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->getTicks()I,sdk,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->isAuthoritativeSource()Z,sdk,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->toInstant()Ljava/time/Instant;,sdk,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;-><init>(Landroid/net/thread/ActiveOperationalDataset;Landroid/net/thread/OperationalDatasetTimestamp;Ljava/time/Duration;)V,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->fromThreadTlvs([B)Landroid/net/thread/PendingOperationalDataset;,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getActiveOperationalDataset()Landroid/net/thread/ActiveOperationalDataset;,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getDelayTimer()Ljava/time/Duration;,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getPendingTimestamp()Landroid/net/thread/OperationalDatasetTimestamp;,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->toThreadTlvs()[B,sdk,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/thread/ThreadNetworkController;->THREAD_VERSION_1_3:I,sdk,system-api,test-api
-Landroid/net/thread/ThreadNetworkController;->getThreadVersion()I,sdk,system-api,test-api
 Landroid/net/thread/ThreadNetworkManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/thread/ThreadNetworkManager;->getAllThreadNetworkControllers()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub;->asBinder()Landroid/os/IBinder;,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 edb423a..dcee496 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -562,16 +562,16 @@ Landroid/net/DhcpOption$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Obje
 Landroid/net/DhcpOption$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/DhcpOption;->describeContents()I,public-api,system-api,test-api
 Landroid/net/DhcpOption;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->onCancel()V,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->onCancel()V,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onCancel()V,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda7;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->onCancel()V,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onAnswer(Ljava/lang/Object;I)V,public-api,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onError(Landroid/net/DnsResolver$DnsException;)V,public-api,system-api,test-api
@@ -957,11 +957,6 @@ Landroid/net/LinkProperties;->setUsePrivateDns(Z)V,system-api,test-api
 Landroid/net/LinkProperties;->setValidatedPrivateDnsServers(Ljava/util/Collection;)V,system-api,test-api
 Landroid/net/LinkProperties;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/LinkProperties;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo;->describeContents()I,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/LocalNetworkInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/MacAddress$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/MacAddress$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/MacAddress;->BROADCAST_ADDRESS:Landroid/net/MacAddress;,public-api,system-api,test-api
@@ -1017,7 +1012,7 @@ Landroid/net/Network;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,pu
 Landroid/net/Network;->openConnection(Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;,public-api,system-api,test-api
 Landroid/net/Network;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/Network;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/NetworkAgent$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkAgent$$ExternalSyntheticLambda17;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkAgent$NetworkAgentHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;ILandroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;Landroid/net/NetworkScore;Landroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,system-api,test-api
@@ -1310,12 +1305,12 @@ Landroid/net/NetworkStateSnapshot;->equals(Ljava/lang/Object;)Z,core-platform-ap
 Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$$ExternalSyntheticLambda6;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$1;->hasNext()Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$1;->next()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
@@ -1610,7 +1605,7 @@ Landroid/net/TetheringInterface;->getType()I,system-api,test-api
 Landroid/net/TetheringInterface;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringInterface;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringInterface;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-api,system-api,test-api
@@ -1920,7 +1915,6 @@ Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-pl
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write([CII)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/com/android/internal/util/FileRotator$$ExternalSyntheticLambda0;->applyAsLong(Ljava/lang/Object;)J,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava/time/ZoneId;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,system-api,test-api
@@ -2680,9 +2674,9 @@ Landroid/net/nsd/INsdManager$Default;->asBinder()Landroid/os/IBinder;,public-api
 Landroid/net/nsd/INsdManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceFound(Landroid/net/nsd/NsdServiceInfo;)V,public-api,system-api,test-api
@@ -2821,84 +2815,25 @@ Landroid/net/nsd/OffloadServiceInfo;->toString()Ljava/lang/String;,core-platform
 Landroid/net/nsd/OffloadServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;-><init>()V,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;-><init>(Landroid/net/thread/ActiveOperationalDataset;)V,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->build()Landroid/net/thread/ActiveOperationalDataset;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setActiveTimestamp(Landroid/net/thread/OperationalDatasetTimestamp;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setChannel(II)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setChannelMask(Landroid/util/SparseArray;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setExtendedPanId([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setMeshLocalPrefix(Landroid/net/IpPrefix;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setNetworkKey([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setNetworkName(Ljava/lang/String;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setPanId(I)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setPskc([B)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$Builder;->setSecurityPolicy(Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;)Landroid/net/thread/ActiveOperationalDataset$Builder;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;-><init>(I[B)V,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->DEFAULT_ROTATION_TIME_HOURS:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->LENGTH_MIN_SECURITY_POLICY_FLAGS:I,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->getFlags()[B,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->getRotationTimeHours()I,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_MAX_24_GHZ:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_MIN_24_GHZ:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CHANNEL_PAGE_24_GHZ:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_EXTENDED_PAN_ID:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MAX_DATASET_TLVS:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MAX_NETWORK_NAME_BYTES:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MESH_LOCAL_PREFIX_BITS:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_MIN_NETWORK_NAME_BYTES:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_NETWORK_KEY:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->LENGTH_PSKC:I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->createRandomDataset()Landroid/net/thread/ActiveOperationalDataset;,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->describeContents()I,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->fromThreadTlvs([B)Landroid/net/thread/ActiveOperationalDataset;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getActiveTimestamp()Landroid/net/thread/OperationalDatasetTimestamp;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannel()I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannelMask()Landroid/util/SparseArray;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getChannelPage()I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getExtendedPanId()[B,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getMeshLocalPrefix()Landroid/net/IpPrefix;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getNetworkKey()[B,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getNetworkName()Ljava/lang/String;,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getPanId()I,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getPskc()[B,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->getSecurityPolicy()Landroid/net/thread/ActiveOperationalDataset$SecurityPolicy;,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ActiveOperationalDataset;->toThreadTlvs()[B,system-api,test-api
 Landroid/net/thread/ActiveOperationalDataset;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;-><init>(JIZ)V,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->fromInstant(Ljava/time/Instant;)Landroid/net/thread/OperationalDatasetTimestamp;,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->getSeconds()J,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->getTicks()I,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->hashCode()I,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->isAuthoritativeSource()Z,system-api,test-api
-Landroid/net/thread/OperationalDatasetTimestamp;->toInstant()Ljava/time/Instant;,system-api,test-api
 Landroid/net/thread/OperationalDatasetTimestamp;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;-><init>(Landroid/net/thread/ActiveOperationalDataset;Landroid/net/thread/OperationalDatasetTimestamp;Ljava/time/Duration;)V,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->describeContents()I,public-api,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->fromThreadTlvs([B)Landroid/net/thread/PendingOperationalDataset;,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getActiveOperationalDataset()Landroid/net/thread/ActiveOperationalDataset;,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getDelayTimer()Ljava/time/Duration;,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->getPendingTimestamp()Landroid/net/thread/OperationalDatasetTimestamp;,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/PendingOperationalDataset;->toThreadTlvs()[B,system-api,test-api
 Landroid/net/thread/PendingOperationalDataset;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/thread/ThreadNetworkController;->THREAD_VERSION_1_3:I,system-api,test-api
-Landroid/net/thread/ThreadNetworkController;->getThreadVersion()I,system-api,test-api
 Landroid/net/thread/ThreadNetworkManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/thread/ThreadNetworkManager;->getAllThreadNetworkControllers()Ljava/util/List;,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
diff --git a/go/current/hiddenapi/index.csv b/go/current/hiddenapi/index.csv
index dd0f1d9..35d40b8 100644
--- a/go/current/hiddenapi/index.csv
+++ b/go/current/hiddenapi/index.csv
@@ -1,50 +1,50 @@
 signature,file,startline,startcol,endline,endcol,properties
 Landroid/app/usage/NetworkStatsManager;->setPollForce(Z)V,packages/modules/Connectivity/framework-t/src/android/app/usage/NetworkStatsManager.java,203,5,203,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2348,9,2348,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2272,9,2272,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2276,9,2276,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2281,9,2281,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2286,9,2286,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,380,5,380,25,
-Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,395,5,395,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,404,5,404,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,419,5,419,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_ERRORED_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,428,5,428,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,692,5,692,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,701,5,701,25,
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,710,5,710,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,729,5,729,25,
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,739,5,739,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,976,5,976,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1175,5,1175,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1244,5,1244,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1616,5,1616,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1735,5,1735,25,
-Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1772,5,1772,25,
-Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1796,5,1796,88,maxTargetSdk=28&trackingBug=109783091L
-Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1821,5,1821,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2058,5,2058,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2144,5,2144,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2173,5,2173,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2203,5,2203,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2449,5,2449,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2649,5,2649,25,
-Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2703,5,2703,25,
-Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2713,5,2713,25,
-Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2840,5,2840,25,
-Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2885,5,2885,25,
-Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2903,5,2903,25,
-Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2918,5,2918,25,
-Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2939,5,2939,25,
-Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2983,5,2983,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3007,5,3007,25,
-Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3245,5,3245,25,
-Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3263,5,3263,25,
-Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3282,5,3282,25,
-Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3306,5,3306,25,
-Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3422,5,3422,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3671,5,3671,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5514,5,5514,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2322,9,2322,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2246,9,2246,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2250,9,2250,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2255,9,2255,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2260,9,2260,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,376,5,376,25,
+Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,391,5,391,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,400,5,400,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,415,5,415,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ERRORED_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,424,5,424,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,688,5,688,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,697,5,697,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,706,5,706,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,725,5,725,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,735,5,735,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,961,5,961,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1149,5,1149,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1218,5,1218,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1590,5,1590,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1709,5,1709,25,
+Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1746,5,1746,25,
+Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1770,5,1770,88,maxTargetSdk=28&trackingBug=109783091L
+Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1795,5,1795,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2032,5,2032,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2118,5,2118,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2147,5,2147,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2177,5,2177,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2423,5,2423,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2623,5,2623,25,
+Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2677,5,2677,25,
+Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2687,5,2687,25,
+Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2814,5,2814,25,
+Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2859,5,2859,25,
+Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2877,5,2877,25,
+Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2892,5,2892,25,
+Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2913,5,2913,25,
+Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2957,5,2957,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2981,5,2981,25,
+Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3219,5,3219,25,
+Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3237,5,3237,25,
+Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3256,5,3256,25,
+Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3280,5,3280,25,
+Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3396,5,3396,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3645,5,3645,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5460,5,5460,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/EthernetManager$Listener;->onAvailabilityChanged(Ljava/lang/String;Z)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,165,9,165,92,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/EthernetManager;->getConfiguration(Ljava/lang/String;)Landroid/net/IpConfiguration;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,192,5,192,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/EthernetManager;->setConfiguration(Ljava/lang/String;Landroid/net/IpConfiguration;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,205,5,205,88,maxTargetSdk=30&trackingBug=170729553L
@@ -103,7 +103,7 @@ Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkPropertie
 Landroid/net/MacAddress;->ALL_ZEROS_ADDRESS:Landroid/net/MacAddress;,packages/modules/Connectivity/framework/src/android/net/MacAddress.java,62,5,62,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/Network;->netId:I,packages/modules/Connectivity/framework/src/android/net/Network.java,69,5,69,25,
 Landroid/net/Network;-><init>(I)V,packages/modules/Connectivity/framework/src/android/net/Network.java,115,5,115,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java,1115,5,1115,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java,1124,5,1124,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,409,5,409,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1813,5,1813,63,maxTargetSdk=28
 Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1839,5,1839,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/go/current/hiddenapi/signature-patterns.csv b/go/current/hiddenapi/signature-patterns.csv
index 92318cc..d1cd51a 100644
--- a/go/current/hiddenapi/signature-patterns.csv
+++ b/go/current/hiddenapi/signature-patterns.csv
@@ -69,7 +69,6 @@ android/net/IpSecUdpEncapResponse
 android/net/KeepalivePacketData
 android/net/LinkAddress
 android/net/LinkProperties
-android/net/LocalNetworkInfo
 android/net/MacAddress
 android/net/NattKeepalivePacketData
 android/net/Network
diff --git a/go/current/sdk_library/module-lib/framework-connectivity-stubs.jar b/go/current/sdk_library/module-lib/framework-connectivity-stubs.jar
index c024370..fe3b15f 100644
--- a/go/current/sdk_library/module-lib/framework-connectivity-stubs.jar
+++ b/go/current/sdk_library/module-lib/framework-connectivity-stubs.jar
diff --git a/go/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar b/go/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
index 3ddfb53..e72e6fc 100644
--- a/go/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
+++ b/go/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
diff --git a/go/current/sdk_library/module-lib/framework-connectivity-t.srcjar b/go/current/sdk_library/module-lib/framework-connectivity-t.srcjar
index 3565691..6f1f565 100644
--- a/go/current/sdk_library/module-lib/framework-connectivity-t.srcjar
+++ b/go/current/sdk_library/module-lib/framework-connectivity-t.srcjar
diff --git a/go/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip b/go/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
index 01e6d1d..fa0b655 100644
--- a/go/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
+++ b/go/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
diff --git a/go/current/sdk_library/module-lib/framework-connectivity.srcjar b/go/current/sdk_library/module-lib/framework-connectivity.srcjar
index 2b53cf1..1d3849d 100644
--- a/go/current/sdk_library/module-lib/framework-connectivity.srcjar
+++ b/go/current/sdk_library/module-lib/framework-connectivity.srcjar
diff --git a/go/current/sdk_library/module-lib/framework-connectivity.txt b/go/current/sdk_library/module-lib/framework-connectivity.txt
index bfb4981..193bd92 100644
--- a/go/current/sdk_library/module-lib/framework-connectivity.txt
+++ b/go/current/sdk_library/module-lib/framework-connectivity.txt
@@ -14,7 +14,6 @@ package android.net {
     method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange();
     method @Nullable @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public android.net.LinkProperties getRedactedLinkPropertiesForPackage(@NonNull android.net.LinkProperties, int, @NonNull String);
     method @Nullable @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public android.net.NetworkCapabilities getRedactedNetworkCapabilitiesForPackage(@NonNull android.net.NetworkCapabilities, int, @NonNull String);
-    method @FlaggedApi("com.android.net.flags.support_is_uid_networking_blocked") @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public boolean isUidNetworkingBlocked(int, boolean);
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerDefaultNetworkCallbackForUid(int, @NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS}) public void registerSystemDefaultNetworkCallback(@NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void removeUidFromMeteredNetworkAllowList(int);
@@ -25,7 +24,6 @@ package android.net {
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAcceptPartialConnectivity(@NonNull android.net.Network, boolean, boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAcceptUnvalidated(@NonNull android.net.Network, boolean, boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAvoidUnvalidated(@NonNull android.net.Network);
-    method @FlaggedApi("com.android.net.flags.set_data_saver_via_cm") @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setDataSaverEnabled(boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setFirewallChainEnabled(int, boolean);
     method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setGlobalProxy(@Nullable android.net.ProxyInfo);
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void setLegacyLockdownVpnEnabled(boolean);
@@ -45,7 +43,6 @@ package android.net {
     field public static final int BLOCKED_METERED_REASON_DATA_SAVER = 65536; // 0x10000
     field public static final int BLOCKED_METERED_REASON_MASK = -65536; // 0xffff0000
     field public static final int BLOCKED_METERED_REASON_USER_RESTRICTED = 131072; // 0x20000
-    field @FlaggedApi("com.android.net.flags.basic_background_restrictions_enabled") public static final int BLOCKED_REASON_APP_BACKGROUND = 64; // 0x40
     field public static final int BLOCKED_REASON_APP_STANDBY = 4; // 0x4
     field public static final int BLOCKED_REASON_BATTERY_SAVER = 1; // 0x1
     field public static final int BLOCKED_REASON_DOZE = 2; // 0x2
@@ -53,7 +50,6 @@ package android.net {
     field public static final int BLOCKED_REASON_LOW_POWER_STANDBY = 32; // 0x20
     field public static final int BLOCKED_REASON_NONE = 0; // 0x0
     field public static final int BLOCKED_REASON_RESTRICTED_MODE = 8; // 0x8
-    field @FlaggedApi("com.android.net.flags.basic_background_restrictions_enabled") public static final int FIREWALL_CHAIN_BACKGROUND = 6; // 0x6
     field public static final int FIREWALL_CHAIN_DOZABLE = 1; // 0x1
     field public static final int FIREWALL_CHAIN_LOW_POWER_STANDBY = 5; // 0x5
     field public static final int FIREWALL_CHAIN_OEM_DENY_1 = 7; // 0x7
diff --git a/go/current/sdk_library/module-lib/framework-connectivity_annotations.zip b/go/current/sdk_library/module-lib/framework-connectivity_annotations.zip
index df9140d..cb77f5c 100644
--- a/go/current/sdk_library/module-lib/framework-connectivity_annotations.zip
+++ b/go/current/sdk_library/module-lib/framework-connectivity_annotations.zip
diff --git a/go/current/sdk_library/public/framework-connectivity-stubs.jar b/go/current/sdk_library/public/framework-connectivity-stubs.jar
index 30b9edf..6508e5f 100644
--- a/go/current/sdk_library/public/framework-connectivity-stubs.jar
+++ b/go/current/sdk_library/public/framework-connectivity-stubs.jar
diff --git a/go/current/sdk_library/public/framework-connectivity-t-stubs.jar b/go/current/sdk_library/public/framework-connectivity-t-stubs.jar
index f47fb98..b4d1537 100644
--- a/go/current/sdk_library/public/framework-connectivity-t-stubs.jar
+++ b/go/current/sdk_library/public/framework-connectivity-t-stubs.jar
diff --git a/go/current/sdk_library/public/framework-connectivity-t.srcjar b/go/current/sdk_library/public/framework-connectivity-t.srcjar
index f8f2d4c..e901215 100644
--- a/go/current/sdk_library/public/framework-connectivity-t.srcjar
+++ b/go/current/sdk_library/public/framework-connectivity-t.srcjar
diff --git a/go/current/sdk_library/public/framework-connectivity.srcjar b/go/current/sdk_library/public/framework-connectivity.srcjar
index 3061380..f0efae1 100644
--- a/go/current/sdk_library/public/framework-connectivity.srcjar
+++ b/go/current/sdk_library/public/framework-connectivity.srcjar
diff --git a/go/current/sdk_library/system/framework-connectivity-t-stubs.jar b/go/current/sdk_library/system/framework-connectivity-t-stubs.jar
index dca3093..4af91a1 100644
--- a/go/current/sdk_library/system/framework-connectivity-t-stubs.jar
+++ b/go/current/sdk_library/system/framework-connectivity-t-stubs.jar
diff --git a/go/current/sdk_library/system/framework-connectivity-t.srcjar b/go/current/sdk_library/system/framework-connectivity-t.srcjar
index 250df62..909fbd9 100644
--- a/go/current/sdk_library/system/framework-connectivity-t.srcjar
+++ b/go/current/sdk_library/system/framework-connectivity-t.srcjar
diff --git a/go/current/sdk_library/system/framework-connectivity-t.txt b/go/current/sdk_library/system/framework-connectivity-t.txt
index 23510e1..6f0119e 100644
--- a/go/current/sdk_library/system/framework-connectivity-t.txt
+++ b/go/current/sdk_library/system/framework-connectivity-t.txt
@@ -415,91 +415,3 @@ package android.net.nsd {
 
 }
 
-package android.net.thread {
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ActiveOperationalDataset implements android.os.Parcelable {
-    method @NonNull public static android.net.thread.ActiveOperationalDataset createRandomDataset();
-    method public int describeContents();
-    method @NonNull public static android.net.thread.ActiveOperationalDataset fromThreadTlvs(@NonNull byte[]);
-    method @NonNull public android.net.thread.OperationalDatasetTimestamp getActiveTimestamp();
-    method @IntRange(from=0, to=65535) public int getChannel();
-    method @NonNull @Size(min=1) public android.util.SparseArray<byte[]> getChannelMask();
-    method @IntRange(from=0, to=255) public int getChannelPage();
-    method @NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_EXTENDED_PAN_ID) public byte[] getExtendedPanId();
-    method @NonNull public android.net.IpPrefix getMeshLocalPrefix();
-    method @NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_NETWORK_KEY) public byte[] getNetworkKey();
-    method @NonNull @Size(min=android.net.thread.ActiveOperationalDataset.LENGTH_MIN_NETWORK_NAME_BYTES, max=android.net.thread.ActiveOperationalDataset.LENGTH_MAX_NETWORK_NAME_BYTES) public String getNetworkName();
-    method @IntRange(from=0, to=65534) public int getPanId();
-    method @NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_PSKC) public byte[] getPskc();
-    method @NonNull public android.net.thread.ActiveOperationalDataset.SecurityPolicy getSecurityPolicy();
-    method @NonNull public byte[] toThreadTlvs();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field public static final int CHANNEL_MAX_24_GHZ = 26; // 0x1a
-    field public static final int CHANNEL_MIN_24_GHZ = 11; // 0xb
-    field public static final int CHANNEL_PAGE_24_GHZ = 0; // 0x0
-    field @NonNull public static final android.os.Parcelable.Creator<android.net.thread.ActiveOperationalDataset> CREATOR;
-    field public static final int LENGTH_EXTENDED_PAN_ID = 8; // 0x8
-    field public static final int LENGTH_MAX_DATASET_TLVS = 254; // 0xfe
-    field public static final int LENGTH_MAX_NETWORK_NAME_BYTES = 16; // 0x10
-    field public static final int LENGTH_MESH_LOCAL_PREFIX_BITS = 64; // 0x40
-    field public static final int LENGTH_MIN_NETWORK_NAME_BYTES = 1; // 0x1
-    field public static final int LENGTH_NETWORK_KEY = 16; // 0x10
-    field public static final int LENGTH_PSKC = 16; // 0x10
-  }
-
-  public static final class ActiveOperationalDataset.Builder {
-    ctor public ActiveOperationalDataset.Builder(@NonNull android.net.thread.ActiveOperationalDataset);
-    ctor public ActiveOperationalDataset.Builder();
-    method @NonNull public android.net.thread.ActiveOperationalDataset build();
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setActiveTimestamp(@NonNull android.net.thread.OperationalDatasetTimestamp);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setChannel(@IntRange(from=0, to=255) int, @IntRange(from=0, to=65535) int);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setChannelMask(@NonNull @Size(min=1) android.util.SparseArray<byte[]>);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setExtendedPanId(@NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_EXTENDED_PAN_ID) byte[]);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setMeshLocalPrefix(@NonNull android.net.IpPrefix);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setNetworkKey(@NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_NETWORK_KEY) byte[]);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setNetworkName(@NonNull @Size(min=android.net.thread.ActiveOperationalDataset.LENGTH_MIN_NETWORK_NAME_BYTES, max=android.net.thread.ActiveOperationalDataset.LENGTH_MAX_NETWORK_NAME_BYTES) String);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setPanId(@IntRange(from=0, to=65534) int);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setPskc(@NonNull @Size(android.net.thread.ActiveOperationalDataset.LENGTH_PSKC) byte[]);
-    method @NonNull public android.net.thread.ActiveOperationalDataset.Builder setSecurityPolicy(@NonNull android.net.thread.ActiveOperationalDataset.SecurityPolicy);
-  }
-
-  public static final class ActiveOperationalDataset.SecurityPolicy {
-    ctor public ActiveOperationalDataset.SecurityPolicy(@IntRange(from=1, to=65535) int, @NonNull @Size(min=android.net.thread.ActiveOperationalDataset.SecurityPolicy.LENGTH_MIN_SECURITY_POLICY_FLAGS) byte[]);
-    method @NonNull @Size(min=android.net.thread.ActiveOperationalDataset.SecurityPolicy.LENGTH_MIN_SECURITY_POLICY_FLAGS) public byte[] getFlags();
-    method @IntRange(from=1, to=65535) public int getRotationTimeHours();
-    field public static final int DEFAULT_ROTATION_TIME_HOURS = 672; // 0x2a0
-    field public static final int LENGTH_MIN_SECURITY_POLICY_FLAGS = 1; // 0x1
-  }
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class OperationalDatasetTimestamp {
-    ctor public OperationalDatasetTimestamp(@IntRange(from=0, to=281474976710655L) long, @IntRange(from=0, to=32767) int, boolean);
-    method @NonNull public static android.net.thread.OperationalDatasetTimestamp fromInstant(@NonNull java.time.Instant);
-    method @IntRange(from=0, to=281474976710655L) public long getSeconds();
-    method @IntRange(from=0, to=32767) public int getTicks();
-    method public boolean isAuthoritativeSource();
-    method @NonNull public java.time.Instant toInstant();
-  }
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class PendingOperationalDataset implements android.os.Parcelable {
-    ctor public PendingOperationalDataset(@NonNull android.net.thread.ActiveOperationalDataset, @NonNull android.net.thread.OperationalDatasetTimestamp, @NonNull java.time.Duration);
-    method public int describeContents();
-    method @NonNull public static android.net.thread.PendingOperationalDataset fromThreadTlvs(@NonNull byte[]);
-    method @NonNull public android.net.thread.ActiveOperationalDataset getActiveOperationalDataset();
-    method @NonNull public java.time.Duration getDelayTimer();
-    method @NonNull public android.net.thread.OperationalDatasetTimestamp getPendingTimestamp();
-    method @NonNull public byte[] toThreadTlvs();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.net.thread.PendingOperationalDataset> CREATOR;
-  }
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkController {
-    method public int getThreadVersion();
-    field public static final int THREAD_VERSION_1_3 = 4; // 0x4
-  }
-
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkManager {
-    method @NonNull public java.util.List<android.net.thread.ThreadNetworkController> getAllThreadNetworkControllers();
-  }
-
-}
-
diff --git a/go/current/sdk_library/system/framework-connectivity-t_annotations.zip b/go/current/sdk_library/system/framework-connectivity-t_annotations.zip
index 0271e30..fe86e53 100644
--- a/go/current/sdk_library/system/framework-connectivity-t_annotations.zip
+++ b/go/current/sdk_library/system/framework-connectivity-t_annotations.zip
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index 8fafc6b..d038e1e 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-P65184092
\ No newline at end of file
+11212645
\ No newline at end of file
diff --git a/go/current/x86/lib/libcom.android.tethering.dns_helper.so b/go/current/x86/lib/libcom.android.tethering.dns_helper.so
index d95dc22..8a7b393 100755
--- a/go/current/x86/lib/libcom.android.tethering.dns_helper.so
+++ b/go/current/x86/lib/libcom.android.tethering.dns_helper.so
diff --git a/go/current/x86/lib/libnetd_updatable.so b/go/current/x86/lib/libnetd_updatable.so
index b751dd0..422a5a2 100755
--- a/go/current/x86/lib/libnetd_updatable.so
+++ b/go/current/x86/lib/libnetd_updatable.so
diff --git a/go/current/x86_64/lib/libcom.android.tethering.dns_helper.so b/go/current/x86_64/lib/libcom.android.tethering.dns_helper.so
index 60c637a..65d6b0a 100755
--- a/go/current/x86_64/lib/libcom.android.tethering.dns_helper.so
+++ b/go/current/x86_64/lib/libcom.android.tethering.dns_helper.so
diff --git a/go/current/x86_64/lib/libnetd_updatable.so b/go/current/x86_64/lib/libnetd_updatable.so
index a44538e..43be1bb 100755
--- a/go/current/x86_64/lib/libnetd_updatable.so
+++ b/go/current/x86_64/lib/libnetd_updatable.so