DO NOT MERGE: Drop prebuilt files to android source tree.

The following files have been updated as part of this change:

current/Android.bp
current/snapshot-creation-build-number.txt
current/hiddenapi/annotation-flags.csv
current/hiddenapi/filtered-flags.csv
current/hiddenapi/filtered-stub-flags.csv
current/hiddenapi/hiddenapi-max-target-o-low-priority-tiramisu.txt
current/hiddenapi/hiddenapi-max-target-o-low-priority.txt
current/hiddenapi/hiddenapi-max-target-r-loprio.txt
current/hiddenapi/hiddenapi-unsupported-tiramisu.txt
current/hiddenapi/hiddenapi-unsupported.txt
current/hiddenapi/index.csv
current/hiddenapi/metadata.csv
current/hiddenapi/signature-patterns.csv
current/java_systemserver_libs/snapshot/jars/are/invalid/service-connectivity.jar
current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml
current/licenses/build/soong/licenses/LICENSE
current/sdk_library/public/framework-connectivity-removed.txt
current/sdk_library/public/framework-connectivity-stubs.jar
current/sdk_library/public/framework-connectivity-t-removed.txt
current/sdk_library/public/framework-connectivity-t-stubs.jar
current/sdk_library/public/framework-connectivity-t.srcjar
current/sdk_library/public/framework-connectivity-t.txt
current/sdk_library/public/framework-connectivity-t_annotations.zip
current/sdk_library/public/framework-connectivity.srcjar
current/sdk_library/public/framework-connectivity.txt
current/sdk_library/public/framework-connectivity_annotations.zip
current/sdk_library/public/framework-tethering-removed.txt
current/sdk_library/public/framework-tethering-stubs.jar
current/sdk_library/public/framework-tethering.srcjar
current/sdk_library/public/framework-tethering.txt
current/sdk_library/public/framework-tethering_annotations.zip
current/sdk_library/module-lib/framework-connectivity-removed.txt
current/sdk_library/module-lib/framework-connectivity-stubs.jar
current/sdk_library/module-lib/framework-connectivity-t-removed.txt
current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
current/sdk_library/module-lib/framework-connectivity-t.srcjar
current/sdk_library/module-lib/framework-connectivity-t.txt
current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
current/sdk_library/module-lib/framework-connectivity.srcjar
current/sdk_library/module-lib/framework-connectivity.txt
current/sdk_library/module-lib/framework-connectivity_annotations.zip
current/sdk_library/module-lib/framework-tethering-removed.txt
current/sdk_library/module-lib/framework-tethering-stubs.jar
current/sdk_library/module-lib/framework-tethering.srcjar
current/sdk_library/module-lib/framework-tethering.txt
current/sdk_library/module-lib/framework-tethering_annotations.zip
current/sdk_library/system/framework-connectivity-removed.txt
current/sdk_library/system/framework-connectivity-stubs.jar
current/sdk_library/system/framework-connectivity-t-removed.txt
current/sdk_library/system/framework-connectivity-t-stubs.jar
current/sdk_library/system/framework-connectivity-t.srcjar
current/sdk_library/system/framework-connectivity-t.txt
current/sdk_library/system/framework-connectivity-t_annotations.zip
current/sdk_library/system/framework-connectivity.srcjar
current/sdk_library/system/framework-connectivity.txt
current/sdk_library/system/framework-connectivity_annotations.zip
current/sdk_library/system/framework-tethering-removed.txt
current/sdk_library/system/framework-tethering-stubs.jar
current/sdk_library/system/framework-tethering.srcjar
current/sdk_library/system/framework-tethering.txt
current/sdk_library/system/framework-tethering_annotations.zip

Built here: ab/T1006563

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Bug: 272106880
Change-Id: I7e483dcdefbd7b2966f028c4cdc7dc29f703773e

12 files changed, 110 insertions, 102 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 6cc3d60..845bdbf 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1005628"
+    build_id: "T1006563"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
   }
diff --git a/current/Android.bp b/current/Android.bp
index cdac980..10231bd 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,5 +1,11 @@
 // This is auto-generated. DO NOT EDIT.
 
+// blueprint rules added by vendor/google/build/mainline_modules_sdks.py
+// to support coexistence.
+blueprint_package_includes {
+    match_all: ["com.android.mainline"]
+}
+
 package {
     // A default list here prevents the license LSC from adding its own list which would
     // be unnecessary as every module in the sdk already has its own licenses property.
@@ -58,18 +64,6 @@ prebuilt_platform_compat_config {
     metadata: "compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml",
 }
 
-prebuilt_platform_compat_config {
-    name: "connectivity-t-platform-compat-config",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
-    },
-    visibility: ["//visibility:public"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
-    metadata: "compat_configs/connectivity-t-platform-compat-config/connectivity-t-platform-compat-config_meta.xml",
-}
-
 java_sdk_library_import {
     name: "framework-connectivity",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
diff --git a/current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml b/current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml
index 25dc2c1..df43bba 100644
--- a/current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml
+++ b/current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml
@@ -1,6 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
 <config>
-  <compat-change description="The {@link #getRoutes()} now can contain excluded as well as included routes. Use {@link RouteInfo#getType()} to determine route type." enableAfterTargetSdk="32" id="186082280" name="EXCLUDED_ROUTES">
-    <meta-data definedIn="android.net.LinkProperties" sourcePosition="packages/modules/Connectivity/framework/src/android/net/LinkProperties.java:67" />
+  <compat-change description="The {@link android.net.LinkProperties#getRoutes()} now can contain excluded as well as included routes. Use {@link android.net.RouteInfo#getType()} to determine route type." enableAfterTargetSdk="32" id="186082280" name="EXCLUDED_ROUTES">
+    <meta-data definedIn="android.net.connectivity.ConnectivityCompatChanges" sourcePosition="packages/modules/Connectivity/framework/src/android/net/connectivity/ConnectivityCompatChanges.java:39" />
+  </compat-change>
+  <compat-change description="When enabled, apps targeting &lt; Android 12 are considered legacy for the NSD native daemon. The platform will only keep the daemon running as long as there are any legacy apps connected. After Android 12, direct communication with the native daemon might not work since the native daemon won't always stay alive. Using the NSD APIs from NsdManager as the replacement is recommended. Another alternative could be bundling your own mdns solutions instead of depending on the system mdns native daemon. This compatibility change applies to Android 13 and later only. To toggle behavior on Android 12 and Android 12L, use RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS." enableSinceTargetSdk="31" id="235355681" name="RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER">
+    <meta-data definedIn="android.net.connectivity.ConnectivityCompatChanges" sourcePosition="packages/modules/Connectivity/framework/src/android/net/connectivity/ConnectivityCompatChanges.java:60" />
+  </compat-change>
+  <compat-change description="The self certified capabilities check should be enabled after android 13. &lt;p&gt; See {@link android.net.NetworkCapabilities} for more details." enableAfterTargetSdk="33" id="266524688" name="ENABLE_SELF_CERTIFIED_CAPABILITIES_DECLARATION">
+    <meta-data definedIn="android.net.connectivity.ConnectivityCompatChanges" sourcePosition="packages/modules/Connectivity/framework/src/android/net/connectivity/ConnectivityCompatChanges.java:72" />
   </compat-change>
 </config>
\ No newline at end of file
diff --git a/current/hiddenapi/annotation-flags.csv b/current/hiddenapi/annotation-flags.csv
index 747ab30..77fded5 100644
--- a/current/hiddenapi/annotation-flags.csv
+++ b/current/hiddenapi/annotation-flags.csv
@@ -179,7 +179,6 @@ Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroi
 Landroid/net/NetworkTemplate;->buildTemplateMobileWildcard()Landroid/net/NetworkTemplate;,max-target-r
 Landroid/net/NetworkTemplate;->buildTemplateWifi()Landroid/net/NetworkTemplate;,unsupported
 Landroid/net/NetworkTemplate;->buildTemplateWifiWildcard()Landroid/net/NetworkTemplate;,unsupported
-Landroid/net/NetworkTemplate;->getMatchRule()I,unsupported
 Landroid/net/NetworkTemplate;->getSubscriberId()Ljava/lang/String;,unsupported
 Landroid/net/NetworkTemplate;->normalize(Landroid/net/NetworkTemplate;[Ljava/lang/String;)Landroid/net/NetworkTemplate;,unsupported
 Landroid/net/NetworkUtils;->getImplicitNetmask(Ljava/net/Inet4Address;)I,max-target-r
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index ffef987..287ce77 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -569,6 +569,8 @@ Landroid/net/ConnectivityManager$PacketKeepalive$$ExternalSyntheticLambda0;->run
 Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$PacketKeepalive;->BINDER_DIED:I,lo-prio,max-target-o
 Landroid/net/ConnectivityManager$PacketKeepalive;->ERROR_HARDWARE_ERROR:I,lo-prio,max-target-o
 Landroid/net/ConnectivityManager$PacketKeepalive;->ERROR_HARDWARE_UNSUPPORTED:I,lo-prio,max-target-o
@@ -583,7 +585,6 @@ Landroid/net/ConnectivityManager$PacketKeepalive;->NO_KEEPALIVE:I,lo-prio,max-ta
 Landroid/net/ConnectivityManager$PacketKeepalive;->SUCCESS:I,lo-prio,max-target-o
 Landroid/net/ConnectivityManager$PacketKeepalive;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/ConnectivityManager$PacketKeepalive;->mNetwork:Landroid/net/Network;,lo-prio,max-target-o
-Landroid/net/ConnectivityManager$PacketKeepalive;->mSlot:Ljava/lang/Integer;,lo-prio,max-target-o
 Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,max-target-r
 Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,max-target-r
 Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,max-target-r
@@ -1036,7 +1037,6 @@ Landroid/net/IConnectivityManager$Stub$Proxy;->setAvoidUnvalidated(Landroid/net/
 Landroid/net/IConnectivityManager$Stub$Proxy;->setGlobalProxy(Landroid/net/ProxyInfo;)V,lo-prio,max-target-o
 Landroid/net/IConnectivityManager$Stub$Proxy;->setProvisioningNotificationVisible(ZILjava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/IConnectivityManager$Stub$Proxy;->startCaptivePortalApp(Landroid/net/Network;)V,lo-prio,max-target-o
-Landroid/net/IConnectivityManager$Stub$Proxy;->stopKeepalive(Landroid/net/Network;I)V,lo-prio,max-target-o
 Landroid/net/IConnectivityManager$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/IConnectivityManager$Stub;->TRANSACTION_factoryReset:I,lo-prio,max-target-o
 Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getActiveLinkProperties:I,lo-prio,max-target-o
@@ -1128,7 +1128,6 @@ Landroid/net/IConnectivityManager;->setAvoidUnvalidated(Landroid/net/Network;)V,
 Landroid/net/IConnectivityManager;->setGlobalProxy(Landroid/net/ProxyInfo;)V,lo-prio,max-target-o
 Landroid/net/IConnectivityManager;->setProvisioningNotificationVisible(ZILjava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/IConnectivityManager;->startCaptivePortalApp(Landroid/net/Network;)V,lo-prio,max-target-o
-Landroid/net/IConnectivityManager;->stopKeepalive(Landroid/net/Network;I)V,lo-prio,max-target-o
 Landroid/net/IEthernetManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/IEthernetManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,lo-prio,max-target-o
 Landroid/net/IEthernetManager$Stub$Proxy;->addListener(Landroid/net/IEthernetServiceListener;)V,lo-prio,max-target-o
@@ -2543,10 +2542,9 @@ Landroid/net/NetworkTemplate;->CREATOR:Landroid/os/Parcelable$Creator;,unsupport
 Landroid/net/NetworkTemplate;->MATCH_BLUETOOTH:I,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->MATCH_ETHERNET:I,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->MATCH_MOBILE:I,lo-prio,max-target-o
-Landroid/net/NetworkTemplate;->MATCH_MOBILE_WILDCARD:I,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->MATCH_PROXY:I,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->MATCH_WIFI:I,lo-prio,max-target-o
-Landroid/net/NetworkTemplate;->MATCH_WIFI_WILDCARD:I,lo-prio,max-target-o
+Landroid/net/NetworkTemplate;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->buildTemplateBluetooth()Landroid/net/NetworkTemplate;,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->buildTemplateEthernet()Landroid/net/NetworkTemplate;,unsupported
 Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate;,unsupported
@@ -2557,7 +2555,6 @@ Landroid/net/NetworkTemplate;->buildTemplateWifi(Ljava/lang/String;)Landroid/net
 Landroid/net/NetworkTemplate;->buildTemplateWifiWildcard()Landroid/net/NetworkTemplate;,unsupported
 Landroid/net/NetworkTemplate;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/NetworkTemplate;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkTemplate;->getMatchRule()I,unsupported
 Landroid/net/NetworkTemplate;->getMatchRuleName(I)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->getNetworkId()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->getSubscriberId()Ljava/lang/String;,unsupported
@@ -2569,19 +2566,16 @@ Landroid/net/NetworkTemplate;->mMatchRule:I,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->mMatchSubscriberIds:[Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->mMetered:I,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->mRoaming:I,lo-prio,max-target-o
-Landroid/net/NetworkTemplate;->mSubscriberId:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matches(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matchesBluetooth(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matchesDefaultNetwork(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matchesEthernet(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matchesMetered(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matchesMobile(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
-Landroid/net/NetworkTemplate;->matchesMobileWildcard(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matchesProxy(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matchesRoaming(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matchesSubscriberId(Ljava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->matchesWifi(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
-Landroid/net/NetworkTemplate;->matchesWifiWildcard(Landroid/net/NetworkIdentity;)Z,lo-prio,max-target-o
 Landroid/net/NetworkTemplate;->normalize(Landroid/net/NetworkTemplate;[Ljava/lang/String;)Landroid/net/NetworkTemplate;,unsupported
 Landroid/net/NetworkTemplate;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkTemplate;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
@@ -2745,6 +2739,8 @@ Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda0;->run()V,core-platform-
 Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/SocketKeepalive$Callback;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/SocketKeepalive$Callback;->onDataReceived()V,public-api,sdk,system-api,test-api
 Landroid/net/SocketKeepalive$Callback;->onError(I)V,public-api,sdk,system-api,test-api
@@ -3375,3 +3371,7 @@ Landroid/net/nsd/NsdServiceInfo;->setServiceName(Ljava/lang/String;)V,public-api
 Landroid/net/nsd/NsdServiceInfo;->setServiceType(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,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
+Landroid/net/wear/ICompanionDeviceManagerProxy$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 594d139..fd1573d 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -485,6 +485,8 @@ Landroid/net/ConnectivityManager$PacketKeepalive$$ExternalSyntheticLambda0;->run
 Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/ConnectivityManager$PacketKeepalive$1$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/ConnectivityManager;->ACTION_BACKGROUND_DATA_SETTING_CHANGED:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/ConnectivityManager;->ACTION_CAPTIVE_PORTAL_SIGN_IN:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/ConnectivityManager;->ACTION_RESTRICT_BACKGROUND_CHANGED:Ljava/lang/String;,public-api,system-api,test-api
@@ -1529,6 +1531,8 @@ Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda0;->run()V,core-platform-
 Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/SocketKeepalive$1$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/SocketKeepalive$Callback;-><init>()V,public-api,system-api,test-api
 Landroid/net/SocketKeepalive$Callback;->onDataReceived()V,public-api,system-api,test-api
 Landroid/net/SocketKeepalive$Callback;->onError(I)V,public-api,system-api,test-api
@@ -2062,3 +2066,7 @@ Landroid/net/nsd/NsdServiceInfo;->setServiceName(Ljava/lang/String;)V,public-api
 Landroid/net/nsd/NsdServiceInfo;->setServiceType(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,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
+Landroid/net/wear/ICompanionDeviceManagerProxy$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index de7ff02..02a92c2 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,10 +1,10 @@
 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,2211,9,2211,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2137,9,2137,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2141,9,2141,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2144,9,2144,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2147,9,2147,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2300,9,2300,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2224,9,2224,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2228,9,2228,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2233,9,2233,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2238,9,2238,92,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,356,5,356,25,
 Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,371,5,371,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,380,5,380,88,maxTargetSdk=30&trackingBug=170729553L
@@ -18,33 +18,33 @@ Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Conn
 Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,941,5,941,88,maxTargetSdk=28&trackingBug=130143562L
 Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1129,5,1129,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1198,5,1198,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1481,5,1481,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1600,5,1600,25,
-Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1637,5,1637,25,
-Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1661,5,1661,88,maxTargetSdk=28&trackingBug=109783091L
-Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1686,5,1686,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1923,5,1923,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2009,5,2009,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2038,5,2038,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2068,5,2068,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,2292,5,2292,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2472,5,2472,25,
-Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2526,5,2526,25,
-Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2536,5,2536,25,
-Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2663,5,2663,25,
-Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2708,5,2708,25,
-Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2726,5,2726,25,
-Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2741,5,2741,25,
-Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2762,5,2762,25,
-Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2806,5,2806,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2830,5,2830,25,
-Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3068,5,3068,25,
-Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3086,5,3086,25,
-Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3105,5,3105,25,
-Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3129,5,3129,25,
-Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3245,5,3245,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3494,5,3494,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5290,5,5290,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1568,5,1568,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1687,5,1687,25,
+Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1724,5,1724,25,
+Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1748,5,1748,88,maxTargetSdk=28&trackingBug=109783091L
+Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1773,5,1773,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2010,5,2010,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2096,5,2096,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2125,5,2125,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2155,5,2155,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,2401,5,2401,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2581,5,2581,25,
+Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2635,5,2635,25,
+Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2645,5,2645,25,
+Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2772,5,2772,25,
+Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2817,5,2817,25,
+Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2835,5,2835,25,
+Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2850,5,2850,25,
+Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2871,5,2871,25,
+Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2915,5,2915,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2939,5,2939,25,
+Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3177,5,3177,25,
+Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3195,5,3195,25,
+Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3214,5,3214,25,
+Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3238,5,3238,25,
+Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3354,5,3354,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3603,5,3603,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5399,5,5399,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
@@ -82,40 +82,40 @@ Landroid/net/LinkAddress;->address:Ljava/net/InetAddress;,packages/modules/Conne
 Landroid/net/LinkAddress;->prefixLength:I,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,87,5,87,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/LinkAddress;->isIPv6()Z,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,172,5,172,63,maxTargetSdk=28
 Landroid/net/LinkAddress;->getNetworkPrefixLength()I,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,412,5,412,25,
-Landroid/net/LinkProperties;->mIfaceName:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,73,5,73,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/LinkProperties;->compareProvisioning(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Landroid/net/LinkProperties$ProvisioningChange;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,133,5,133,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/LinkProperties;->getAllAddresses()Ljava/util/List;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,282,5,282,25,
-Landroid/net/LinkProperties;->addStackedLink(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,865,5,865,25,
-Landroid/net/LinkProperties;->getStackedLinks()Ljava/util/List;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,893,5,893,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/LinkProperties;->hasIPv4Address()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1065,5,1065,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasGlobalIPv6Address()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1120,5,1120,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasIPv4DefaultRoute()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1163,5,1163,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasIPv6DefaultRoute()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1191,5,1191,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasIPv4DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1219,5,1219,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasIPv6DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1247,5,1247,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->isIPv6Provisioned()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1317,5,1317,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->isIdenticalInterfaceName(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1395,5,1395,25,
-Landroid/net/LinkProperties;->isIdenticalAddresses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1418,5,1418,25,
-Landroid/net/LinkProperties;->isIdenticalDnses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1430,5,1430,25,
-Landroid/net/LinkProperties;->isIdenticalRoutes(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1483,5,1483,25,
-Landroid/net/LinkProperties;->isIdenticalHttpProxy(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1495,5,1495,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1507,5,1507,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/LinkProperties;->mIfaceName:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,61,5,61,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/LinkProperties;->compareProvisioning(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Landroid/net/LinkProperties$ProvisioningChange;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,121,5,121,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/LinkProperties;->getAllAddresses()Ljava/util/List;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,270,5,270,25,
+Landroid/net/LinkProperties;->addStackedLink(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,853,5,853,25,
+Landroid/net/LinkProperties;->getStackedLinks()Ljava/util/List;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,881,5,881,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/LinkProperties;->hasIPv4Address()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1053,5,1053,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasGlobalIPv6Address()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1108,5,1108,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasIPv4DefaultRoute()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1151,5,1151,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasIPv6DefaultRoute()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1179,5,1179,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasIPv4DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1207,5,1207,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasIPv6DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1235,5,1235,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->isIPv6Provisioned()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1305,5,1305,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->isIdenticalInterfaceName(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1383,5,1383,25,
+Landroid/net/LinkProperties;->isIdenticalAddresses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1406,5,1406,25,
+Landroid/net/LinkProperties;->isIdenticalDnses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1418,5,1418,25,
+Landroid/net/LinkProperties;->isIdenticalRoutes(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1471,5,1471,25,
+Landroid/net/LinkProperties;->isIdenticalHttpProxy(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1483,5,1483,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1495,5,1495,88,maxTargetSdk=30&trackingBug=170729553L
 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,1077,5,1077,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,332,5,332,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1647,5,1647,63,maxTargetSdk=28
-Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1673,5,1673,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2414,5,2414,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java,1092,5,1092,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,385,5,385,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1716,5,1716,63,maxTargetSdk=28
+Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2467,5,2467,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkInfo;-><init>(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,182,5,182,25,
 Landroid/net/NetworkInfo;->setSubtype(ILjava/lang/String;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,253,5,253,25,
 Landroid/net/NetworkInfo;->setIsAvailable(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,372,5,372,25,
 Landroid/net/NetworkInfo;->setFailover(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,403,5,403,25,
 Landroid/net/NetworkInfo;->setRoaming(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,434,5,434,25,
-Landroid/net/NetworkRequest;->networkCapabilities:Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java,78,5,78,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkRequest;->requestId:I,packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java,87,5,87,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkRequest;->legacyType:I,packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java,95,5,95,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/NetworkRequest;->networkCapabilities:Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java,161,5,161,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkRequest;->requestId:I,packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java,170,5,170,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkRequest;->legacyType:I,packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java,178,5,178,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/NetworkState;->network:Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/NetworkState.java,41,5,41,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/NetworkState;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework/src/android/net/NetworkState.java,92,5,92,25,
 Landroid/net/NetworkState;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework/src/android/net/NetworkState.java,117,5,117,25,
@@ -168,16 +168,15 @@ Landroid/net/NetworkStatsHistory;->recordEntireHistory(Landroid/net/NetworkStats
 Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,758,5,758,25,
 Landroid/net/NetworkStatsHistory;->getValues(JJJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,773,5,773,25,
 Landroid/net/NetworkStatsHistory;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,1001,5,1001,25,
-Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,202,5,202,25,
-Landroid/net/NetworkTemplate;->buildTemplateMobileWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,235,5,235,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkTemplate;->buildTemplateWifiWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,246,5,246,25,
-Landroid/net/NetworkTemplate;->buildTemplateWifi()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,255,5,255,25,
-Landroid/net/NetworkTemplate;->buildTemplateEthernet()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,305,5,305,25,
-Landroid/net/NetworkTemplate;-><init>(ILjava/lang/String;Ljava/lang/String;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,392,5,392,25,
-Landroid/net/NetworkTemplate;->getMatchRule()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,561,5,561,25,
-Landroid/net/NetworkTemplate;->getSubscriberId()Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,580,5,580,25,
-Landroid/net/NetworkTemplate;->normalize(Landroid/net/NetworkTemplate;[Ljava/lang/String;)Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,888,5,888,25,
-Landroid/net/NetworkTemplate;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,931,5,931,25,
+Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,212,5,213,65,maxTargetSdk=33&publicAlternatives=%22Use+%7B%40code+Builder%7D+instead.%22
+Landroid/net/NetworkTemplate;->buildTemplateMobileWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,227,5,227,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkTemplate;->buildTemplateWifiWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,240,5,241,65,maxTargetSdk=33&publicAlternatives=%22Use+%7B%40code+Builder%7D+instead.%22
+Landroid/net/NetworkTemplate;->buildTemplateWifi()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,251,5,252,65,maxTargetSdk=33&publicAlternatives=%22Use+%7B%40code+Builder%7D+instead.%22
+Landroid/net/NetworkTemplate;->buildTemplateEthernet()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,265,5,266,65,maxTargetSdk=33&publicAlternatives=%22Use+%7B%40code+Builder%7D+instead.%22
+Landroid/net/NetworkTemplate;-><init>(ILjava/lang/String;Ljava/lang/String;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,440,5,441,65,maxTargetSdk=33&publicAlternatives=%22Use+%7B%40code+Builder%7D+instead.%22
+Landroid/net/NetworkTemplate;->getSubscriberId()Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,641,5,642,88,maxTargetSdk=33&publicAlternatives=%22Caller+should+use+%7B%40code+getSubscriberIds%7D+instead.%22
+Landroid/net/NetworkTemplate;->normalize(Landroid/net/NetworkTemplate;[Ljava/lang/String;)Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,932,5,935,74,maxTargetSdk=33&publicAlternatives=%22There+is+no+alternative+for+%7B%40code+NetworkTemplate.normalize%7D.Callers+should+have+their+own+logic+to+merge+template+for+different+IMSIs+and+stop+calling+this+function.%22
+Landroid/net/NetworkTemplate;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,1004,5,1004,25,
 Landroid/net/NetworkUtils;->intToInetAddress(I)Ljava/net/InetAddress;,packages/modules/Connectivity/framework/src/android/net/NetworkUtils.java,183,5,183,25,
 Landroid/net/NetworkUtils;->prefixLengthToNetmaskInt(I)I,packages/modules/Connectivity/framework/src/android/net/NetworkUtils.java,205,5,205,25,
 Landroid/net/NetworkUtils;->netmaskToPrefixLength(Ljava/net/Inet4Address;)I,packages/modules/Connectivity/framework/src/android/net/NetworkUtils.java,228,5,228,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/current/hiddenapi/metadata.csv b/current/hiddenapi/metadata.csv
index 7405fd8..d61914f 100644
--- a/current/hiddenapi/metadata.csv
+++ b/current/hiddenapi/metadata.csv
@@ -173,16 +173,15 @@ signature,implicitMember,maxTargetSdk,overrideSourcePosition,publicAlternatives,
 |Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;|,||,||,||,||,||
 |Landroid/net/NetworkStatsHistory;->recordEntireHistory(Landroid/net/NetworkStatsHistory;)V|,||,||,||,||,||
 |Landroid/net/NetworkStatsHistory;->size()I|,||,|30|,||,||,|170729553|
-|Landroid/net/NetworkTemplate;-><init>(ILjava/lang/String;Ljava/lang/String;)V|,||,||,||,||,||
+|Landroid/net/NetworkTemplate;-><init>(ILjava/lang/String;Ljava/lang/String;)V|,||,|33|,||,|Use {@code Builder} instead.|,||
 |Landroid/net/NetworkTemplate;->CREATOR:Landroid/os/Parcelable$Creator;|,||,||,||,||,||
-|Landroid/net/NetworkTemplate;->buildTemplateEthernet()Landroid/net/NetworkTemplate;|,||,||,||,||,||
-|Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate;|,||,||,||,||,||
+|Landroid/net/NetworkTemplate;->buildTemplateEthernet()Landroid/net/NetworkTemplate;|,||,|33|,||,|Use {@code Builder} instead.|,||
+|Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate;|,||,|33|,||,|Use {@code Builder} instead.|,||
 |Landroid/net/NetworkTemplate;->buildTemplateMobileWildcard()Landroid/net/NetworkTemplate;|,||,|30|,||,||,|170729553|
-|Landroid/net/NetworkTemplate;->buildTemplateWifi()Landroid/net/NetworkTemplate;|,||,||,||,||,||
-|Landroid/net/NetworkTemplate;->buildTemplateWifiWildcard()Landroid/net/NetworkTemplate;|,||,||,||,||,||
-|Landroid/net/NetworkTemplate;->getMatchRule()I|,||,||,||,||,||
-|Landroid/net/NetworkTemplate;->getSubscriberId()Ljava/lang/String;|,||,||,||,||,||
-|Landroid/net/NetworkTemplate;->normalize(Landroid/net/NetworkTemplate;[Ljava/lang/String;)Landroid/net/NetworkTemplate;|,||,||,||,||,||
+|Landroid/net/NetworkTemplate;->buildTemplateWifi()Landroid/net/NetworkTemplate;|,||,|33|,||,|Use {@code Builder} instead.|,||
+|Landroid/net/NetworkTemplate;->buildTemplateWifiWildcard()Landroid/net/NetworkTemplate;|,||,|33|,||,|Use {@code Builder} instead.|,||
+|Landroid/net/NetworkTemplate;->getSubscriberId()Ljava/lang/String;|,||,|33|,||,|Caller should use {@code getSubscriberIds} instead.|,||
+|Landroid/net/NetworkTemplate;->normalize(Landroid/net/NetworkTemplate;[Ljava/lang/String;)Landroid/net/NetworkTemplate;|,||,|33|,||,|There is no alternative for {@code NetworkTemplate.normalize}.Callers should have their own logic to merge template for different IMSIs and stop calling this function.|,||
 |Landroid/net/NetworkUtils;->getImplicitNetmask(Ljava/net/Inet4Address;)I|,||,|30|,||,||,|170729553|
 |Landroid/net/NetworkUtils;->intToInetAddress(I)Ljava/net/InetAddress;|,||,||,||,||,||
 |Landroid/net/NetworkUtils;->netmaskToPrefixLength(Ljava/net/Inet4Address;)I|,||,|30|,||,||,|170729553|
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index ca60d25..5abd727 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -130,6 +130,9 @@ android/net/UnderlyingNetworkInfo
 android/net/VpnTransportInfo
 android/net/apf/**
 android/net/connectivity/**
+android/net/http/apihelpers/**
+android/net/http/internal/**
 android/net/netstats/provider/**
 android/net/nsd/**
 android/net/util/KeepaliveUtils
+android/net/wear/**
diff --git a/current/sdk_library/public/framework-connectivity-stubs.jar b/current/sdk_library/public/framework-connectivity-stubs.jar
index ad6e442..d61f82c 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.srcjar b/current/sdk_library/public/framework-connectivity.srcjar
index 40cd726..9ecd65d 100644
--- a/current/sdk_library/public/framework-connectivity.srcjar
+++ b/current/sdk_library/public/framework-connectivity.srcjar
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 5fec41f..418260f 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9783802
\ No newline at end of file
+9895353
\ No newline at end of file