Merge cherrypicks of [16049893, 16049894, 16049738, 16049991, 16049805, 16050129, 16049859, 16049992, 16049993, 16049994, 16049806, 16049739, 16050147, 16049257, 16049352, 16049645, 16049258, 16049492, 16050148, 16049493, 16049324, 16049995, 16049740, 16050149, 16049860, 16050130, 16050150, 16049741, 16050131, 16049996, 16049997, 16049714, 16049998, 16050151, 16049646, 16049325, 16050152] into sc-qpr1-releaseandroid-12.0.0_r28android-12.0.0_r26android-12.0.0_r16android12-qpr1-release

Change-Id: I43e6fcc6ca8e0478669b0e816db77201a0d6dea6

4 files changed, 13 insertions, 7 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 484e599..4d74828 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: "7653768"
+    build_id: "7808645"
     target: "mainline_modules-user"
     source_file: "mainline-sdks/tethering-module-sdk-current.zip"
   }
@@ -8,7 +8,7 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Connectivity"
-  git_branch: "sc-dev"
+  git_branch: "sc-qpr1-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
     rename {
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index b997155..dcfbccc 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -2582,6 +2582,7 @@ Landroid/net/NetworkCapabilities;->removeDefaultCapabilites()Landroid/net/Networ
 Landroid/net/NetworkCapabilities;->removeForbiddenCapability(I)Landroid/net/NetworkCapabilities;,blocked
 Landroid/net/NetworkCapabilities;->removeTransportType(I)Landroid/net/NetworkCapabilities;,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->restrictCapabilitesForTestNetwork(I)V,blocked
+Landroid/net/NetworkCapabilities;->restrictCapabilitiesForTestNetwork(I)V,blocked
 Landroid/net/NetworkCapabilities;->satisfiedByImmutableNetworkCapabilities(Landroid/net/NetworkCapabilities;)Z,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->satisfiedByLinkBandwidths(Landroid/net/NetworkCapabilities;)Z,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->satisfiedByNetCapabilities(Landroid/net/NetworkCapabilities;Z)Z,lo-prio,max-target-o
@@ -4117,7 +4118,6 @@ Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILI
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J,blocked
-Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->TRANSPORT_USB:I,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z,blocked
@@ -4151,6 +4151,7 @@ Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_CHECKSUM
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I,blocked
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I,blocked
@@ -4161,9 +4162,11 @@ Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTIO
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I,blocked
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I,blocked
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->INFINITE_LEASE:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;,blocked
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index c773a97..0f3ae5e 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -85,9 +85,9 @@ Landroid/net/Network;->netId:I,packages/modules/Connectivity/framework/src/andro
 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,946,5,946,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,222,5,222,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1439,5,1439,63,maxTargetSdk=28
-Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1465,5,1465,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2148,5,2148,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1452,5,1452,63,maxTargetSdk=28
+Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1478,5,1478,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2161,5,2161,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkInfo;-><init>(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,181,5,181,25,
 Landroid/net/NetworkInfo;->setSubtype(ILjava/lang/String;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,250,5,250,25,
 Landroid/net/NetworkInfo;->setIsAvailable(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,369,5,369,25,
diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index be4e029..e9c1f56 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -2582,6 +2582,7 @@ Landroid/net/NetworkCapabilities;->removeDefaultCapabilites()Landroid/net/Networ
 Landroid/net/NetworkCapabilities;->removeForbiddenCapability(I)Landroid/net/NetworkCapabilities;
 Landroid/net/NetworkCapabilities;->removeTransportType(I)Landroid/net/NetworkCapabilities;
 Landroid/net/NetworkCapabilities;->restrictCapabilitesForTestNetwork(I)V
+Landroid/net/NetworkCapabilities;->restrictCapabilitiesForTestNetwork(I)V
 Landroid/net/NetworkCapabilities;->satisfiedByImmutableNetworkCapabilities(Landroid/net/NetworkCapabilities;)Z
 Landroid/net/NetworkCapabilities;->satisfiedByLinkBandwidths(Landroid/net/NetworkCapabilities;)Z
 Landroid/net/NetworkCapabilities;->satisfiedByNetCapabilities(Landroid/net/NetworkCapabilities;Z)Z
@@ -4117,7 +4118,6 @@ Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILI
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J
-Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->TRANSPORT_USB:I
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z
@@ -4151,6 +4151,7 @@ Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_CHECKSUM
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I
@@ -4161,9 +4162,11 @@ Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTIO
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->INFINITE_LEASE:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;