Fixup b92655da

Signed-off-by: Tad <tad@spotco.us>

Patches/LineageOS-17.1/android_external_freetype/360951.patch

@@ -1,4 +1,4 @@
-From cd6630c7a6387077cec3b6113313d3852bb5c2b2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Werner Lemberg <wl@gnu.org>
 Date: Sat, 19 Mar 2022 06:40:17 +0100
 Subject: [PATCH] DO NOT MERGE - Cherry-pick two upstream changes
@@ -19,10 +19,10 @@ Change-Id: I42469df8e8b07221d64e3f8574c4f30110dbda7e
  1 file changed, 12 insertions(+)
 
 diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
-index e301f8f11..70ba6e749 100644
+index 2b444056c..7fdf15372 100644
 --- a/src/base/ftobjs.c
 +++ b/src/base/ftobjs.c
-@@ -2389,6 +2389,15 @@
+@@ -2358,6 +2358,15 @@
  #endif
  
  
@@ -38,7 +38,7 @@ index e301f8f11..70ba6e749 100644
  #ifdef FT_DEBUG_LEVEL_TRACE
      FT_TRACE3(( "FT_Open_Face: " ));
      if ( face_index < 0 )
-@@ -3244,6 +3253,9 @@
+@@ -3213,6 +3222,9 @@
      if ( !face )
        return FT_THROW( Invalid_Face_Handle );
  

Patches/LineageOS-17.1/android_frameworks_base/360954.patch

@@ -1,4 +1,4 @@
-From 40c4c5abce61b881309acc19be8f483f419ca9a7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michael Groover <mpgroover@google.com>
 Date: Fri, 31 Mar 2023 21:31:22 +0000
 Subject: [PATCH] Limit the number of supported v1 and v2 signers
@@ -22,10 +22,10 @@ Change-Id: I6aa86b615b203cdc69d58a593ccf8f18474ca091
  2 files changed, 21 insertions(+)
 
 diff --git a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java
-index 346fe293d7aee..f0c20bec7d7b6 100644
+index b36888e23f9c..0fa5358e9b86 100644
 --- a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java
 +++ b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java
-@@ -75,6 +75,11 @@ public class ApkSignatureSchemeV2Verifier {
+@@ -83,6 +83,11 @@ public class ApkSignatureSchemeV2Verifier {
  
      private static final int APK_SIGNATURE_SCHEME_V2_BLOCK_ID = 0x7109871a;
  
@@ -37,7 +37,7 @@ index 346fe293d7aee..f0c20bec7d7b6 100644
      /**
       * Returns {@code true} if the provided APK contains an APK Signature Scheme V2 signature.
       *
-@@ -183,6 +188,11 @@ private static VerifiedSigner verify(
+@@ -188,6 +193,11 @@ public class ApkSignatureSchemeV2Verifier {
          }
          while (signers.hasRemaining()) {
              signerCount++;
@@ -50,7 +50,7 @@ index 346fe293d7aee..f0c20bec7d7b6 100644
                  ByteBuffer signer = getLengthPrefixedSlice(signers);
                  X509Certificate[] certs = verifySigner(signer, contentDigests, certFactory);
 diff --git a/core/java/android/util/jar/StrictJarVerifier.java b/core/java/android/util/jar/StrictJarVerifier.java
-index 45254908c5c96..a6aca330d323e 100644
+index 45254908c5c9..a6aca330d323 100644
 --- a/core/java/android/util/jar/StrictJarVerifier.java
 +++ b/core/java/android/util/jar/StrictJarVerifier.java
 @@ -78,6 +78,11 @@ class StrictJarVerifier {
@@ -65,7 +65,7 @@ index 45254908c5c96..a6aca330d323e 100644
      private final String jarName;
      private final StrictJarManifest manifest;
      private final HashMap<String, byte[]> metaEntries;
-@@ -293,10 +298,16 @@ synchronized boolean readCertificates() {
+@@ -293,10 +298,16 @@ class StrictJarVerifier {
              return false;
          }
  

Patches/LineageOS-17.1/android_frameworks_base/360955.patch

@@ -1,4 +1,4 @@
-From d82d12e9a1b41102034236f4c607cfeb4d14cd10 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Bill Yi <byi@google.com>
 Date: Tue, 4 Apr 2023 10:14:08 -0700
 Subject: [PATCH] Import translations. DO NOT MERGE ANYWHERE
@@ -98,7 +98,7 @@ Change-Id: I1720c67e4361d9019b12fa5a510cd34918dfedb4
  85 files changed, 170 insertions(+)
 
 diff --git a/packages/VpnDialogs/res/values-af/strings.xml b/packages/VpnDialogs/res/values-af/strings.xml
-index ac82b0e0009a1..b2718fd83e4fc 100644
+index ac82b0e0009a..b2718fd83e4f 100644
 --- a/packages/VpnDialogs/res/values-af/strings.xml
 +++ b/packages/VpnDialogs/res/values-af/strings.xml
 @@ -33,4 +33,6 @@
@@ -109,7 +109,7 @@ index ac82b0e0009a1..b2718fd83e4fc 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-am/strings.xml b/packages/VpnDialogs/res/values-am/strings.xml
-index ad9773b248a4e..91821fba203b2 100644
+index ad9773b248a4..91821fba203b 100644
 --- a/packages/VpnDialogs/res/values-am/strings.xml
 +++ b/packages/VpnDialogs/res/values-am/strings.xml
 @@ -33,4 +33,6 @@
@@ -120,7 +120,7 @@ index ad9773b248a4e..91821fba203b2 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ar/strings.xml b/packages/VpnDialogs/res/values-ar/strings.xml
-index 808cde906d2ff..20057c66750c4 100644
+index 808cde906d2f..20057c66750c 100644
 --- a/packages/VpnDialogs/res/values-ar/strings.xml
 +++ b/packages/VpnDialogs/res/values-ar/strings.xml
 @@ -33,4 +33,6 @@
@@ -131,7 +131,7 @@ index 808cde906d2ff..20057c66750c4 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-as/strings.xml b/packages/VpnDialogs/res/values-as/strings.xml
-index 45d8458f4d45c..9d05505b1fa8d 100644
+index 45d8458f4d45..9d05505b1fa8 100644
 --- a/packages/VpnDialogs/res/values-as/strings.xml
 +++ b/packages/VpnDialogs/res/values-as/strings.xml
 @@ -33,4 +33,6 @@
@@ -142,7 +142,7 @@ index 45d8458f4d45c..9d05505b1fa8d 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-az/strings.xml b/packages/VpnDialogs/res/values-az/strings.xml
-index 2bdf23ee2aa09..47cdeee180ed8 100644
+index 2bdf23ee2aa0..47cdeee180ed 100644
 --- a/packages/VpnDialogs/res/values-az/strings.xml
 +++ b/packages/VpnDialogs/res/values-az/strings.xml
 @@ -33,4 +33,6 @@
@@ -153,7 +153,7 @@ index 2bdf23ee2aa09..47cdeee180ed8 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-b+sr+Latn/strings.xml b/packages/VpnDialogs/res/values-b+sr+Latn/strings.xml
-index f40e40670bf39..ea8e60d36ba5d 100644
+index f40e40670bf3..ea8e60d36ba5 100644
 --- a/packages/VpnDialogs/res/values-b+sr+Latn/strings.xml
 +++ b/packages/VpnDialogs/res/values-b+sr+Latn/strings.xml
 @@ -33,4 +33,6 @@
@@ -164,7 +164,7 @@ index f40e40670bf39..ea8e60d36ba5d 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-be/strings.xml b/packages/VpnDialogs/res/values-be/strings.xml
-index 0903c8ece36b3..914a1638b14a2 100644
+index 0903c8ece36b..914a1638b14a 100644
 --- a/packages/VpnDialogs/res/values-be/strings.xml
 +++ b/packages/VpnDialogs/res/values-be/strings.xml
 @@ -33,4 +33,6 @@
@@ -175,7 +175,7 @@ index 0903c8ece36b3..914a1638b14a2 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-bg/strings.xml b/packages/VpnDialogs/res/values-bg/strings.xml
-index 9ac853d2016fd..e1aa242496de2 100644
+index 9ac853d2016f..e1aa242496de 100644
 --- a/packages/VpnDialogs/res/values-bg/strings.xml
 +++ b/packages/VpnDialogs/res/values-bg/strings.xml
 @@ -33,4 +33,6 @@
@@ -186,7 +186,7 @@ index 9ac853d2016fd..e1aa242496de2 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-bn/strings.xml b/packages/VpnDialogs/res/values-bn/strings.xml
-index 5e11fd9934b64..1b0fc48a9139f 100644
+index 5e11fd9934b6..1b0fc48a9139 100644
 --- a/packages/VpnDialogs/res/values-bn/strings.xml
 +++ b/packages/VpnDialogs/res/values-bn/strings.xml
 @@ -33,4 +33,6 @@
@@ -197,7 +197,7 @@ index 5e11fd9934b64..1b0fc48a9139f 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-bs/strings.xml b/packages/VpnDialogs/res/values-bs/strings.xml
-index 56812d59e1068..c8537ca6de177 100644
+index 56812d59e106..c8537ca6de17 100644
 --- a/packages/VpnDialogs/res/values-bs/strings.xml
 +++ b/packages/VpnDialogs/res/values-bs/strings.xml
 @@ -33,4 +33,6 @@
@@ -208,7 +208,7 @@ index 56812d59e1068..c8537ca6de177 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ca/strings.xml b/packages/VpnDialogs/res/values-ca/strings.xml
-index 97738c316f4bd..1702e553f6e3b 100644
+index 97738c316f4b..1702e553f6e3 100644
 --- a/packages/VpnDialogs/res/values-ca/strings.xml
 +++ b/packages/VpnDialogs/res/values-ca/strings.xml
 @@ -33,4 +33,6 @@
@@ -219,7 +219,7 @@ index 97738c316f4bd..1702e553f6e3b 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-cs/strings.xml b/packages/VpnDialogs/res/values-cs/strings.xml
-index 5cc809c7cb027..909cd2982b278 100644
+index 5cc809c7cb02..909cd2982b27 100644
 --- a/packages/VpnDialogs/res/values-cs/strings.xml
 +++ b/packages/VpnDialogs/res/values-cs/strings.xml
 @@ -33,4 +33,6 @@
@@ -230,7 +230,7 @@ index 5cc809c7cb027..909cd2982b278 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-da/strings.xml b/packages/VpnDialogs/res/values-da/strings.xml
-index 7641158af3da6..f8985bd263f3b 100644
+index 7641158af3da..f8985bd263f3 100644
 --- a/packages/VpnDialogs/res/values-da/strings.xml
 +++ b/packages/VpnDialogs/res/values-da/strings.xml
 @@ -33,4 +33,6 @@
@@ -241,7 +241,7 @@ index 7641158af3da6..f8985bd263f3b 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-de/strings.xml b/packages/VpnDialogs/res/values-de/strings.xml
-index 0f1e009804394..d757363157679 100644
+index 0f1e00980439..d75736315767 100644
 --- a/packages/VpnDialogs/res/values-de/strings.xml
 +++ b/packages/VpnDialogs/res/values-de/strings.xml
 @@ -33,4 +33,6 @@
@@ -252,7 +252,7 @@ index 0f1e009804394..d757363157679 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-el/strings.xml b/packages/VpnDialogs/res/values-el/strings.xml
-index 78bcc43ff6099..13df0dda440d7 100644
+index 78bcc43ff609..13df0dda440d 100644
 --- a/packages/VpnDialogs/res/values-el/strings.xml
 +++ b/packages/VpnDialogs/res/values-el/strings.xml
 @@ -33,4 +33,6 @@
@@ -263,7 +263,7 @@ index 78bcc43ff6099..13df0dda440d7 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-en-rAU/strings.xml b/packages/VpnDialogs/res/values-en-rAU/strings.xml
-index 6ed50a7668ae4..0fb49a1ad7e72 100644
+index 6ed50a7668ae..0fb49a1ad7e7 100644
 --- a/packages/VpnDialogs/res/values-en-rAU/strings.xml
 +++ b/packages/VpnDialogs/res/values-en-rAU/strings.xml
 @@ -33,4 +33,6 @@
@@ -274,7 +274,7 @@ index 6ed50a7668ae4..0fb49a1ad7e72 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-en-rCA/strings.xml b/packages/VpnDialogs/res/values-en-rCA/strings.xml
-index 6ed50a7668ae4..0fb49a1ad7e72 100644
+index 6ed50a7668ae..0fb49a1ad7e7 100644
 --- a/packages/VpnDialogs/res/values-en-rCA/strings.xml
 +++ b/packages/VpnDialogs/res/values-en-rCA/strings.xml
 @@ -33,4 +33,6 @@
@@ -285,7 +285,7 @@ index 6ed50a7668ae4..0fb49a1ad7e72 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-en-rGB/strings.xml b/packages/VpnDialogs/res/values-en-rGB/strings.xml
-index 6ed50a7668ae4..0fb49a1ad7e72 100644
+index 6ed50a7668ae..0fb49a1ad7e7 100644
 --- a/packages/VpnDialogs/res/values-en-rGB/strings.xml
 +++ b/packages/VpnDialogs/res/values-en-rGB/strings.xml
 @@ -33,4 +33,6 @@
@@ -296,7 +296,7 @@ index 6ed50a7668ae4..0fb49a1ad7e72 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-en-rIN/strings.xml b/packages/VpnDialogs/res/values-en-rIN/strings.xml
-index 6ed50a7668ae4..0fb49a1ad7e72 100644
+index 6ed50a7668ae..0fb49a1ad7e7 100644
 --- a/packages/VpnDialogs/res/values-en-rIN/strings.xml
 +++ b/packages/VpnDialogs/res/values-en-rIN/strings.xml
 @@ -33,4 +33,6 @@
@@ -307,7 +307,7 @@ index 6ed50a7668ae4..0fb49a1ad7e72 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-en-rXC/strings.xml b/packages/VpnDialogs/res/values-en-rXC/strings.xml
-index 9d010e63518f9..2fb8403a69203 100644
+index 9d010e63518f..2fb8403a6920 100644
 --- a/packages/VpnDialogs/res/values-en-rXC/strings.xml
 +++ b/packages/VpnDialogs/res/values-en-rXC/strings.xml
 @@ -33,4 +33,6 @@
@@ -318,7 +318,7 @@ index 9d010e63518f9..2fb8403a69203 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ ( ‎‏‎‎‏‏‎<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-es-rUS/strings.xml b/packages/VpnDialogs/res/values-es-rUS/strings.xml
-index 21cfc042e707f..4917d6158bba9 100644
+index 21cfc042e707..4917d6158bba 100644
 --- a/packages/VpnDialogs/res/values-es-rUS/strings.xml
 +++ b/packages/VpnDialogs/res/values-es-rUS/strings.xml
 @@ -33,4 +33,6 @@
@@ -329,7 +329,7 @@ index 21cfc042e707f..4917d6158bba9 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-es/strings.xml b/packages/VpnDialogs/res/values-es/strings.xml
-index 372147f2479a0..6efb545a97eda 100644
+index 372147f2479a..6efb545a97ed 100644
 --- a/packages/VpnDialogs/res/values-es/strings.xml
 +++ b/packages/VpnDialogs/res/values-es/strings.xml
 @@ -33,4 +33,6 @@
@@ -340,7 +340,7 @@ index 372147f2479a0..6efb545a97eda 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-et/strings.xml b/packages/VpnDialogs/res/values-et/strings.xml
-index c328cd725396e..b15c130f0d702 100644
+index c328cd725396..b15c130f0d70 100644
 --- a/packages/VpnDialogs/res/values-et/strings.xml
 +++ b/packages/VpnDialogs/res/values-et/strings.xml
 @@ -33,4 +33,6 @@
@@ -351,7 +351,7 @@ index c328cd725396e..b15c130f0d702 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-eu/strings.xml b/packages/VpnDialogs/res/values-eu/strings.xml
-index a3b7716e91d33..a07237366c292 100644
+index a3b7716e91d3..a07237366c29 100644
 --- a/packages/VpnDialogs/res/values-eu/strings.xml
 +++ b/packages/VpnDialogs/res/values-eu/strings.xml
 @@ -33,4 +33,6 @@
@@ -362,7 +362,7 @@ index a3b7716e91d33..a07237366c292 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-fa/strings.xml b/packages/VpnDialogs/res/values-fa/strings.xml
-index 56f847c158279..30e7493141c68 100644
+index 56f847c15827..30e7493141c6 100644
 --- a/packages/VpnDialogs/res/values-fa/strings.xml
 +++ b/packages/VpnDialogs/res/values-fa/strings.xml
 @@ -33,4 +33,6 @@
@@ -373,7 +373,7 @@ index 56f847c158279..30e7493141c68 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-fi/strings.xml b/packages/VpnDialogs/res/values-fi/strings.xml
-index 91c918af09c3f..40d4a9feb4a10 100644
+index 91c918af09c3..40d4a9feb4a1 100644
 --- a/packages/VpnDialogs/res/values-fi/strings.xml
 +++ b/packages/VpnDialogs/res/values-fi/strings.xml
 @@ -33,4 +33,6 @@
@@ -384,7 +384,7 @@ index 91c918af09c3f..40d4a9feb4a10 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-fr-rCA/strings.xml b/packages/VpnDialogs/res/values-fr-rCA/strings.xml
-index aa86c7ca8a7f1..2bcf6b2ed382e 100644
+index aa86c7ca8a7f..2bcf6b2ed382 100644
 --- a/packages/VpnDialogs/res/values-fr-rCA/strings.xml
 +++ b/packages/VpnDialogs/res/values-fr-rCA/strings.xml
 @@ -33,4 +33,6 @@
@@ -395,7 +395,7 @@ index aa86c7ca8a7f1..2bcf6b2ed382e 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-fr/strings.xml b/packages/VpnDialogs/res/values-fr/strings.xml
-index 71801197ddf26..820c8f98c8065 100644
+index 71801197ddf2..820c8f98c806 100644
 --- a/packages/VpnDialogs/res/values-fr/strings.xml
 +++ b/packages/VpnDialogs/res/values-fr/strings.xml
 @@ -33,4 +33,6 @@
@@ -406,7 +406,7 @@ index 71801197ddf26..820c8f98c8065 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-gl/strings.xml b/packages/VpnDialogs/res/values-gl/strings.xml
-index 8a66d081a71be..765e7f7336e23 100644
+index 8a66d081a71b..765e7f7336e2 100644
 --- a/packages/VpnDialogs/res/values-gl/strings.xml
 +++ b/packages/VpnDialogs/res/values-gl/strings.xml
 @@ -33,4 +33,6 @@
@@ -417,7 +417,7 @@ index 8a66d081a71be..765e7f7336e23 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-gu/strings.xml b/packages/VpnDialogs/res/values-gu/strings.xml
-index 961711c57c3de..6faeb8758d0b4 100644
+index 961711c57c3d..6faeb8758d0b 100644
 --- a/packages/VpnDialogs/res/values-gu/strings.xml
 +++ b/packages/VpnDialogs/res/values-gu/strings.xml
 @@ -33,4 +33,6 @@
@@ -428,7 +428,7 @@ index 961711c57c3de..6faeb8758d0b4 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-hi/strings.xml b/packages/VpnDialogs/res/values-hi/strings.xml
-index eed0858787d9e..80914cf5ee15d 100644
+index eed0858787d9..80914cf5ee15 100644
 --- a/packages/VpnDialogs/res/values-hi/strings.xml
 +++ b/packages/VpnDialogs/res/values-hi/strings.xml
 @@ -33,4 +33,6 @@
@@ -439,7 +439,7 @@ index eed0858787d9e..80914cf5ee15d 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-hr/strings.xml b/packages/VpnDialogs/res/values-hr/strings.xml
-index aa9e436f56e72..7d68f0ab4f44b 100644
+index aa9e436f56e7..7d68f0ab4f44 100644
 --- a/packages/VpnDialogs/res/values-hr/strings.xml
 +++ b/packages/VpnDialogs/res/values-hr/strings.xml
 @@ -33,4 +33,6 @@
@@ -450,7 +450,7 @@ index aa9e436f56e72..7d68f0ab4f44b 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-hu/strings.xml b/packages/VpnDialogs/res/values-hu/strings.xml
-index 703aa792f3c33..97d3946418b45 100644
+index 703aa792f3c3..97d3946418b4 100644
 --- a/packages/VpnDialogs/res/values-hu/strings.xml
 +++ b/packages/VpnDialogs/res/values-hu/strings.xml
 @@ -33,4 +33,6 @@
@@ -461,7 +461,7 @@ index 703aa792f3c33..97d3946418b45 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-hy/strings.xml b/packages/VpnDialogs/res/values-hy/strings.xml
-index c296c85472830..84eace72bb3c5 100644
+index c296c8547283..84eace72bb3c 100644
 --- a/packages/VpnDialogs/res/values-hy/strings.xml
 +++ b/packages/VpnDialogs/res/values-hy/strings.xml
 @@ -33,4 +33,6 @@
@@ -472,7 +472,7 @@ index c296c85472830..84eace72bb3c5 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-in/strings.xml b/packages/VpnDialogs/res/values-in/strings.xml
-index 18ef372a8cda0..1782b696805bd 100644
+index 18ef372a8cda..1782b696805b 100644
 --- a/packages/VpnDialogs/res/values-in/strings.xml
 +++ b/packages/VpnDialogs/res/values-in/strings.xml
 @@ -33,4 +33,6 @@
@@ -483,7 +483,7 @@ index 18ef372a8cda0..1782b696805bd 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-is/strings.xml b/packages/VpnDialogs/res/values-is/strings.xml
-index 70fb40fc467ca..af87d13e7aaf6 100644
+index 70fb40fc467c..af87d13e7aaf 100644
 --- a/packages/VpnDialogs/res/values-is/strings.xml
 +++ b/packages/VpnDialogs/res/values-is/strings.xml
 @@ -33,4 +33,6 @@
@@ -494,7 +494,7 @@ index 70fb40fc467ca..af87d13e7aaf6 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-it/strings.xml b/packages/VpnDialogs/res/values-it/strings.xml
-index 2602493faf002..5689acbea102a 100644
+index 2602493faf00..5689acbea102 100644
 --- a/packages/VpnDialogs/res/values-it/strings.xml
 +++ b/packages/VpnDialogs/res/values-it/strings.xml
 @@ -33,4 +33,6 @@
@@ -505,7 +505,7 @@ index 2602493faf002..5689acbea102a 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-iw/strings.xml b/packages/VpnDialogs/res/values-iw/strings.xml
-index ebabd4e71aef5..12cfc323e9655 100644
+index ebabd4e71aef..12cfc323e965 100644
 --- a/packages/VpnDialogs/res/values-iw/strings.xml
 +++ b/packages/VpnDialogs/res/values-iw/strings.xml
 @@ -33,4 +33,6 @@
@@ -516,7 +516,7 @@ index ebabd4e71aef5..12cfc323e9655 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ja/strings.xml b/packages/VpnDialogs/res/values-ja/strings.xml
-index 8480692e9dd36..32898a3a1ce22 100644
+index 8480692e9dd3..32898a3a1ce2 100644
 --- a/packages/VpnDialogs/res/values-ja/strings.xml
 +++ b/packages/VpnDialogs/res/values-ja/strings.xml
 @@ -33,4 +33,6 @@
@@ -527,7 +527,7 @@ index 8480692e9dd36..32898a3a1ce22 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g>（<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>）"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ka/strings.xml b/packages/VpnDialogs/res/values-ka/strings.xml
-index e5a07532c32e3..0cc59d21a1da4 100644
+index e5a07532c32e..0cc59d21a1da 100644
 --- a/packages/VpnDialogs/res/values-ka/strings.xml
 +++ b/packages/VpnDialogs/res/values-ka/strings.xml
 @@ -33,4 +33,6 @@
@@ -538,7 +538,7 @@ index e5a07532c32e3..0cc59d21a1da4 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-kk/strings.xml b/packages/VpnDialogs/res/values-kk/strings.xml
-index 79f79c34e1b40..d702f3f4a4246 100644
+index 79f79c34e1b4..d702f3f4a424 100644
 --- a/packages/VpnDialogs/res/values-kk/strings.xml
 +++ b/packages/VpnDialogs/res/values-kk/strings.xml
 @@ -33,4 +33,6 @@
@@ -549,7 +549,7 @@ index 79f79c34e1b40..d702f3f4a4246 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-km/strings.xml b/packages/VpnDialogs/res/values-km/strings.xml
-index 06f34dbf27331..60627104f3f4b 100644
+index 06f34dbf2733..60627104f3f4 100644
 --- a/packages/VpnDialogs/res/values-km/strings.xml
 +++ b/packages/VpnDialogs/res/values-km/strings.xml
 @@ -33,4 +33,6 @@
@@ -560,7 +560,7 @@ index 06f34dbf27331..60627104f3f4b 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-kn/strings.xml b/packages/VpnDialogs/res/values-kn/strings.xml
-index 040cd6c5aeda2..254d64de3bdf9 100644
+index 040cd6c5aeda..254d64de3bdf 100644
 --- a/packages/VpnDialogs/res/values-kn/strings.xml
 +++ b/packages/VpnDialogs/res/values-kn/strings.xml
 @@ -33,4 +33,6 @@
@@ -571,7 +571,7 @@ index 040cd6c5aeda2..254d64de3bdf9 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ko/strings.xml b/packages/VpnDialogs/res/values-ko/strings.xml
-index 6ad497680ae79..d2281938176ac 100644
+index 6ad497680ae7..d2281938176a 100644
 --- a/packages/VpnDialogs/res/values-ko/strings.xml
 +++ b/packages/VpnDialogs/res/values-ko/strings.xml
 @@ -33,4 +33,6 @@
@@ -582,7 +582,7 @@ index 6ad497680ae79..d2281938176ac 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g>(<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ky/strings.xml b/packages/VpnDialogs/res/values-ky/strings.xml
-index 4e2f698bb1e53..4521766745712 100644
+index 23c9be8819a8..353e13c17157 100644
 --- a/packages/VpnDialogs/res/values-ky/strings.xml
 +++ b/packages/VpnDialogs/res/values-ky/strings.xml
 @@ -33,4 +33,6 @@
@@ -593,7 +593,7 @@ index 4e2f698bb1e53..4521766745712 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-lo/strings.xml b/packages/VpnDialogs/res/values-lo/strings.xml
-index c591308480c16..1b851e127abd4 100644
+index c591308480c1..1b851e127abd 100644
 --- a/packages/VpnDialogs/res/values-lo/strings.xml
 +++ b/packages/VpnDialogs/res/values-lo/strings.xml
 @@ -33,4 +33,6 @@
@@ -604,7 +604,7 @@ index c591308480c16..1b851e127abd4 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-lt/strings.xml b/packages/VpnDialogs/res/values-lt/strings.xml
-index 8846310730ce5..e8e20a8d218d9 100644
+index 8846310730ce..e8e20a8d218d 100644
 --- a/packages/VpnDialogs/res/values-lt/strings.xml
 +++ b/packages/VpnDialogs/res/values-lt/strings.xml
 @@ -33,4 +33,6 @@
@@ -615,7 +615,7 @@ index 8846310730ce5..e8e20a8d218d9 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-lv/strings.xml b/packages/VpnDialogs/res/values-lv/strings.xml
-index 07625b6173c68..af19f4dce065b 100644
+index 07625b6173c6..af19f4dce065 100644
 --- a/packages/VpnDialogs/res/values-lv/strings.xml
 +++ b/packages/VpnDialogs/res/values-lv/strings.xml
 @@ -33,4 +33,6 @@
@@ -626,7 +626,7 @@ index 07625b6173c68..af19f4dce065b 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-mk/strings.xml b/packages/VpnDialogs/res/values-mk/strings.xml
-index b5a64f2130666..4db7e4a502418 100644
+index b5a64f213066..4db7e4a50241 100644
 --- a/packages/VpnDialogs/res/values-mk/strings.xml
 +++ b/packages/VpnDialogs/res/values-mk/strings.xml
 @@ -33,4 +33,6 @@
@@ -637,7 +637,7 @@ index b5a64f2130666..4db7e4a502418 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ml/strings.xml b/packages/VpnDialogs/res/values-ml/strings.xml
-index 680d0ef539b7a..9d3bba43f84ce 100644
+index 680d0ef539b7..9d3bba43f84c 100644
 --- a/packages/VpnDialogs/res/values-ml/strings.xml
 +++ b/packages/VpnDialogs/res/values-ml/strings.xml
 @@ -33,4 +33,6 @@
@@ -648,7 +648,7 @@ index 680d0ef539b7a..9d3bba43f84ce 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-mn/strings.xml b/packages/VpnDialogs/res/values-mn/strings.xml
-index 9aa104aff5ab6..15f56b155053a 100644
+index 9aa104aff5ab..15f56b155053 100644
 --- a/packages/VpnDialogs/res/values-mn/strings.xml
 +++ b/packages/VpnDialogs/res/values-mn/strings.xml
 @@ -33,4 +33,6 @@
@@ -659,7 +659,7 @@ index 9aa104aff5ab6..15f56b155053a 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-mr/strings.xml b/packages/VpnDialogs/res/values-mr/strings.xml
-index 41d74290815da..99c7f44c9d5f0 100644
+index 41d74290815d..99c7f44c9d5f 100644
 --- a/packages/VpnDialogs/res/values-mr/strings.xml
 +++ b/packages/VpnDialogs/res/values-mr/strings.xml
 @@ -33,4 +33,6 @@
@@ -670,7 +670,7 @@ index 41d74290815da..99c7f44c9d5f0 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ms/strings.xml b/packages/VpnDialogs/res/values-ms/strings.xml
-index b489f2edabc0a..a7de3f1663036 100644
+index b489f2edabc0..a7de3f166303 100644
 --- a/packages/VpnDialogs/res/values-ms/strings.xml
 +++ b/packages/VpnDialogs/res/values-ms/strings.xml
 @@ -33,4 +33,6 @@
@@ -681,7 +681,7 @@ index b489f2edabc0a..a7de3f1663036 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-my/strings.xml b/packages/VpnDialogs/res/values-my/strings.xml
-index 9d60ff42a7cdd..52675b6092ac7 100644
+index 9d60ff42a7cd..52675b6092ac 100644
 --- a/packages/VpnDialogs/res/values-my/strings.xml
 +++ b/packages/VpnDialogs/res/values-my/strings.xml
 @@ -33,4 +33,6 @@
@@ -692,7 +692,7 @@ index 9d60ff42a7cdd..52675b6092ac7 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-nb/strings.xml b/packages/VpnDialogs/res/values-nb/strings.xml
-index be572d4408f87..bad15e913938c 100644
+index be572d4408f8..bad15e913938 100644
 --- a/packages/VpnDialogs/res/values-nb/strings.xml
 +++ b/packages/VpnDialogs/res/values-nb/strings.xml
 @@ -33,4 +33,6 @@
@@ -703,7 +703,7 @@ index be572d4408f87..bad15e913938c 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ne/strings.xml b/packages/VpnDialogs/res/values-ne/strings.xml
-index b716c35cfad42..ac21dd1713d16 100644
+index b716c35cfad4..ac21dd1713d1 100644
 --- a/packages/VpnDialogs/res/values-ne/strings.xml
 +++ b/packages/VpnDialogs/res/values-ne/strings.xml
 @@ -33,4 +33,6 @@
@@ -714,7 +714,7 @@ index b716c35cfad42..ac21dd1713d16 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-nl/strings.xml b/packages/VpnDialogs/res/values-nl/strings.xml
-index 8073b09e203ce..ab77d5e9f2187 100644
+index 8073b09e203c..ab77d5e9f218 100644
 --- a/packages/VpnDialogs/res/values-nl/strings.xml
 +++ b/packages/VpnDialogs/res/values-nl/strings.xml
 @@ -33,4 +33,6 @@
@@ -725,7 +725,7 @@ index 8073b09e203ce..ab77d5e9f2187 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-or/strings.xml b/packages/VpnDialogs/res/values-or/strings.xml
-index f1122ebd43865..40ad247433deb 100644
+index f1122ebd4386..40ad247433de 100644
 --- a/packages/VpnDialogs/res/values-or/strings.xml
 +++ b/packages/VpnDialogs/res/values-or/strings.xml
 @@ -33,4 +33,6 @@
@@ -736,7 +736,7 @@ index f1122ebd43865..40ad247433deb 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-pa/strings.xml b/packages/VpnDialogs/res/values-pa/strings.xml
-index 1815f4fb0d253..a3b6e04061c1a 100644
+index 1815f4fb0d25..a3b6e04061c1 100644
 --- a/packages/VpnDialogs/res/values-pa/strings.xml
 +++ b/packages/VpnDialogs/res/values-pa/strings.xml
 @@ -33,4 +33,6 @@
@@ -747,7 +747,7 @@ index 1815f4fb0d253..a3b6e04061c1a 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-pl/strings.xml b/packages/VpnDialogs/res/values-pl/strings.xml
-index d5201d7fbdf54..3af093ae9841d 100644
+index d5201d7fbdf5..3af093ae9841 100644
 --- a/packages/VpnDialogs/res/values-pl/strings.xml
 +++ b/packages/VpnDialogs/res/values-pl/strings.xml
 @@ -33,4 +33,6 @@
@@ -758,7 +758,7 @@ index d5201d7fbdf54..3af093ae9841d 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-pt-rBR/strings.xml b/packages/VpnDialogs/res/values-pt-rBR/strings.xml
-index 75c140617cf58..8c1ae840aa15f 100644
+index 75c140617cf5..8c1ae840aa15 100644
 --- a/packages/VpnDialogs/res/values-pt-rBR/strings.xml
 +++ b/packages/VpnDialogs/res/values-pt-rBR/strings.xml
 @@ -33,4 +33,6 @@
@@ -769,7 +769,7 @@ index 75c140617cf58..8c1ae840aa15f 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-pt-rPT/strings.xml b/packages/VpnDialogs/res/values-pt-rPT/strings.xml
-index 01beddbab4e4d..34980dc309169 100644
+index 01beddbab4e4..34980dc30916 100644
 --- a/packages/VpnDialogs/res/values-pt-rPT/strings.xml
 +++ b/packages/VpnDialogs/res/values-pt-rPT/strings.xml
 @@ -33,4 +33,6 @@
@@ -780,7 +780,7 @@ index 01beddbab4e4d..34980dc309169 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-pt/strings.xml b/packages/VpnDialogs/res/values-pt/strings.xml
-index 75c140617cf58..8c1ae840aa15f 100644
+index 75c140617cf5..8c1ae840aa15 100644
 --- a/packages/VpnDialogs/res/values-pt/strings.xml
 +++ b/packages/VpnDialogs/res/values-pt/strings.xml
 @@ -33,4 +33,6 @@
@@ -791,7 +791,7 @@ index 75c140617cf58..8c1ae840aa15f 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ro/strings.xml b/packages/VpnDialogs/res/values-ro/strings.xml
-index 4e60df2eca8e8..11137cce96b53 100644
+index 4e60df2eca8e..11137cce96b5 100644
 --- a/packages/VpnDialogs/res/values-ro/strings.xml
 +++ b/packages/VpnDialogs/res/values-ro/strings.xml
 @@ -33,4 +33,6 @@
@@ -802,7 +802,7 @@ index 4e60df2eca8e8..11137cce96b53 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ru/strings.xml b/packages/VpnDialogs/res/values-ru/strings.xml
-index f8fcfb83aa9a6..84a71d25cc160 100644
+index f8fcfb83aa9a..84a71d25cc16 100644
 --- a/packages/VpnDialogs/res/values-ru/strings.xml
 +++ b/packages/VpnDialogs/res/values-ru/strings.xml
 @@ -33,4 +33,6 @@
@@ -813,7 +813,7 @@ index f8fcfb83aa9a6..84a71d25cc160 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-si/strings.xml b/packages/VpnDialogs/res/values-si/strings.xml
-index bb97a5d86c5fa..e1dbf97748397 100644
+index bb97a5d86c5f..e1dbf9774839 100644
 --- a/packages/VpnDialogs/res/values-si/strings.xml
 +++ b/packages/VpnDialogs/res/values-si/strings.xml
 @@ -33,4 +33,6 @@
@@ -824,7 +824,7 @@ index bb97a5d86c5fa..e1dbf97748397 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-sk/strings.xml b/packages/VpnDialogs/res/values-sk/strings.xml
-index a08117adfac1e..ded28aeba8a51 100644
+index a08117adfac1..ded28aeba8a5 100644
 --- a/packages/VpnDialogs/res/values-sk/strings.xml
 +++ b/packages/VpnDialogs/res/values-sk/strings.xml
 @@ -33,4 +33,6 @@
@@ -835,7 +835,7 @@ index a08117adfac1e..ded28aeba8a51 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-sl/strings.xml b/packages/VpnDialogs/res/values-sl/strings.xml
-index d5014fa343945..62bdd03cbe67e 100644
+index d5014fa34394..62bdd03cbe67 100644
 --- a/packages/VpnDialogs/res/values-sl/strings.xml
 +++ b/packages/VpnDialogs/res/values-sl/strings.xml
 @@ -33,4 +33,6 @@
@@ -846,7 +846,7 @@ index d5014fa343945..62bdd03cbe67e 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-sq/strings.xml b/packages/VpnDialogs/res/values-sq/strings.xml
-index 4a96e7b92212d..50ad7cf02c8e6 100644
+index 4a96e7b92212..50ad7cf02c8e 100644
 --- a/packages/VpnDialogs/res/values-sq/strings.xml
 +++ b/packages/VpnDialogs/res/values-sq/strings.xml
 @@ -33,4 +33,6 @@
@@ -857,7 +857,7 @@ index 4a96e7b92212d..50ad7cf02c8e6 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-sr/strings.xml b/packages/VpnDialogs/res/values-sr/strings.xml
-index 8ce8060e333dd..3bc65413b7289 100644
+index 8ce8060e333d..3bc65413b728 100644
 --- a/packages/VpnDialogs/res/values-sr/strings.xml
 +++ b/packages/VpnDialogs/res/values-sr/strings.xml
 @@ -33,4 +33,6 @@
@@ -868,7 +868,7 @@ index 8ce8060e333dd..3bc65413b7289 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-sv/strings.xml b/packages/VpnDialogs/res/values-sv/strings.xml
-index 16b6a31d7d1ad..fee6f971824d3 100644
+index 16b6a31d7d1a..fee6f971824d 100644
 --- a/packages/VpnDialogs/res/values-sv/strings.xml
 +++ b/packages/VpnDialogs/res/values-sv/strings.xml
 @@ -33,4 +33,6 @@
@@ -879,7 +879,7 @@ index 16b6a31d7d1ad..fee6f971824d3 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-sw/strings.xml b/packages/VpnDialogs/res/values-sw/strings.xml
-index ea2688438b7ac..3e696f20fabe8 100644
+index ea2688438b7a..3e696f20fabe 100644
 --- a/packages/VpnDialogs/res/values-sw/strings.xml
 +++ b/packages/VpnDialogs/res/values-sw/strings.xml
 @@ -33,4 +33,6 @@
@@ -890,7 +890,7 @@ index ea2688438b7ac..3e696f20fabe8 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ta/strings.xml b/packages/VpnDialogs/res/values-ta/strings.xml
-index 3b4cc571d8609..8cdffc8579ebd 100644
+index 3b4cc571d860..8cdffc8579eb 100644
 --- a/packages/VpnDialogs/res/values-ta/strings.xml
 +++ b/packages/VpnDialogs/res/values-ta/strings.xml
 @@ -33,4 +33,6 @@
@@ -901,7 +901,7 @@ index 3b4cc571d8609..8cdffc8579ebd 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-te/strings.xml b/packages/VpnDialogs/res/values-te/strings.xml
-index 864c926bc615c..416f2e399240e 100644
+index 864c926bc615..416f2e399240 100644
 --- a/packages/VpnDialogs/res/values-te/strings.xml
 +++ b/packages/VpnDialogs/res/values-te/strings.xml
 @@ -33,4 +33,6 @@
@@ -912,7 +912,7 @@ index 864c926bc615c..416f2e399240e 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-th/strings.xml b/packages/VpnDialogs/res/values-th/strings.xml
-index 333ff5fefacc8..14e2b7fcb8c9e 100644
+index 333ff5fefacc..14e2b7fcb8c9 100644
 --- a/packages/VpnDialogs/res/values-th/strings.xml
 +++ b/packages/VpnDialogs/res/values-th/strings.xml
 @@ -33,4 +33,6 @@
@@ -923,7 +923,7 @@ index 333ff5fefacc8..14e2b7fcb8c9e 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-tl/strings.xml b/packages/VpnDialogs/res/values-tl/strings.xml
-index 9c01c32d0d0d4..b79e262ffce9e 100644
+index 9c01c32d0d0d..b79e262ffce9 100644
 --- a/packages/VpnDialogs/res/values-tl/strings.xml
 +++ b/packages/VpnDialogs/res/values-tl/strings.xml
 @@ -33,4 +33,6 @@
@@ -934,7 +934,7 @@ index 9c01c32d0d0d4..b79e262ffce9e 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-tr/strings.xml b/packages/VpnDialogs/res/values-tr/strings.xml
-index 8665a47e66334..309d116d77150 100644
+index 8665a47e6633..309d116d7715 100644
 --- a/packages/VpnDialogs/res/values-tr/strings.xml
 +++ b/packages/VpnDialogs/res/values-tr/strings.xml
 @@ -33,4 +33,6 @@
@@ -945,7 +945,7 @@ index 8665a47e66334..309d116d77150 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-uk/strings.xml b/packages/VpnDialogs/res/values-uk/strings.xml
-index 8f91abf990b33..fe726049974ae 100644
+index 8f91abf990b3..fe726049974a 100644
 --- a/packages/VpnDialogs/res/values-uk/strings.xml
 +++ b/packages/VpnDialogs/res/values-uk/strings.xml
 @@ -33,4 +33,6 @@
@@ -956,7 +956,7 @@ index 8f91abf990b33..fe726049974ae 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-ur/strings.xml b/packages/VpnDialogs/res/values-ur/strings.xml
-index db0c2971a64cd..d2ee5a8d0aa97 100644
+index db0c2971a64c..d2ee5a8d0aa9 100644
 --- a/packages/VpnDialogs/res/values-ur/strings.xml
 +++ b/packages/VpnDialogs/res/values-ur/strings.xml
 @@ -33,4 +33,6 @@
@@ -967,7 +967,7 @@ index db0c2971a64cd..d2ee5a8d0aa97 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-uz/strings.xml b/packages/VpnDialogs/res/values-uz/strings.xml
-index 5a348a0610d3d..854417691e30c 100644
+index 5a348a0610d3..854417691e30 100644
 --- a/packages/VpnDialogs/res/values-uz/strings.xml
 +++ b/packages/VpnDialogs/res/values-uz/strings.xml
 @@ -33,4 +33,6 @@
@@ -978,7 +978,7 @@ index 5a348a0610d3d..854417691e30c 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-vi/strings.xml b/packages/VpnDialogs/res/values-vi/strings.xml
-index 097c9aeee0134..d74151a819e14 100644
+index 097c9aeee013..d74151a819e1 100644
 --- a/packages/VpnDialogs/res/values-vi/strings.xml
 +++ b/packages/VpnDialogs/res/values-vi/strings.xml
 @@ -33,4 +33,6 @@
@@ -989,7 +989,7 @@ index 097c9aeee0134..d74151a819e14 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-zh-rCN/strings.xml b/packages/VpnDialogs/res/values-zh-rCN/strings.xml
-index 7e528bdfb04a3..92e10fd9fe16d 100644
+index 7e528bdfb04a..92e10fd9fe16 100644
 --- a/packages/VpnDialogs/res/values-zh-rCN/strings.xml
 +++ b/packages/VpnDialogs/res/values-zh-rCN/strings.xml
 @@ -33,4 +33,6 @@
@@ -1000,7 +1000,7 @@ index 7e528bdfb04a3..92e10fd9fe16d 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-zh-rHK/strings.xml b/packages/VpnDialogs/res/values-zh-rHK/strings.xml
-index 49605b08cdeed..a67e30d104087 100644
+index 49605b08cdee..a67e30d10408 100644
 --- a/packages/VpnDialogs/res/values-zh-rHK/strings.xml
 +++ b/packages/VpnDialogs/res/values-zh-rHK/strings.xml
 @@ -33,4 +33,6 @@
@@ -1011,7 +1011,7 @@ index 49605b08cdeed..a67e30d104087 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> ( <xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-zh-rTW/strings.xml b/packages/VpnDialogs/res/values-zh-rTW/strings.xml
-index edd8e61d55556..234635091f118 100644
+index edd8e61d5555..234635091f11 100644
 --- a/packages/VpnDialogs/res/values-zh-rTW/strings.xml
 +++ b/packages/VpnDialogs/res/values-zh-rTW/strings.xml
 @@ -33,4 +33,6 @@
@@ -1022,7 +1022,7 @@ index edd8e61d55556..234635091f118 100644
 +    <string name="sanitized_vpn_label" msgid="1877415015009794766">"<xliff:g id="SANITIZED_VPN_LABEL_0">%1$s</xliff:g> (<xliff:g id="SANITIZED_VPN_LABEL_1">%2$s</xliff:g>)"</string>
  </resources>
 diff --git a/packages/VpnDialogs/res/values-zu/strings.xml b/packages/VpnDialogs/res/values-zu/strings.xml
-index 4ab1225e6fc6b..6c7d0471efac7 100644
+index 4ab1225e6fc6..6c7d0471efac 100644
 --- a/packages/VpnDialogs/res/values-zu/strings.xml
 +++ b/packages/VpnDialogs/res/values-zu/strings.xml
 @@ -33,4 +33,6 @@

Patches/LineageOS-17.1/android_frameworks_base/360956.patch

@@ -1,4 +1,4 @@
-From fcbc4bc0d51ae2f9180ddea578d0a0defb742662 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Nate(Qiang) Jiang" <qiangjiang@google.com>
 Date: Thu, 13 Apr 2023 21:20:37 +0000
 Subject: [PATCH] DO NOT MERGE: Add size check on PPS#policy
@@ -13,7 +13,7 @@ Change-Id: I6e6128b7ed5327da8dbc9186a82bef0f2e4197bb
  1 file changed, 24 insertions(+), 4 deletions(-)
 
 diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java
-index b0a2cc397c53b..4bdacebda0606 100644
+index b0a2cc397c53..4bdacebda060 100644
 --- a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java
 +++ b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java
 @@ -16,6 +16,9 @@
@@ -26,7 +26,7 @@ index b0a2cc397c53b..4bdacebda0606 100644
  import android.os.Parcel;
  import android.os.Parcelable;
  import android.text.TextUtils;
-@@ -269,11 +272,19 @@ public String toString() {
+@@ -269,11 +272,19 @@ public final class Policy implements Parcelable {
           */
          public boolean validate() {
              if (TextUtils.isEmpty(mFqdn)) {
@@ -48,7 +48,7 @@ index b0a2cc397c53b..4bdacebda0606 100644
                  return false;
              }
              return true;
-@@ -449,7 +460,7 @@ public boolean validate() {
+@@ -449,7 +460,7 @@ public final class Policy implements Parcelable {
              }
              for (String ssid : mExcludedSsidList) {
                  if (ssid.getBytes(StandardCharsets.UTF_8).length > MAX_SSID_BYTES) {
@@ -57,7 +57,7 @@ index b0a2cc397c53b..4bdacebda0606 100644
                      return false;
                  }
              }
-@@ -457,15 +468,24 @@ public boolean validate() {
+@@ -457,15 +468,24 @@ public final class Policy implements Parcelable {
          // Validate required protocol to port map.
          if (mRequiredProtoPortMap != null) {
              for (Map.Entry<Integer, String> entry : mRequiredProtoPortMap.entrySet()) {

Patches/LineageOS-17.1/android_frameworks_base/360957.patch

@@ -1,4 +1,4 @@
-From cd13551b9bc759701bbaa50fc0b2c77f0de6e122 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Nate(Qiang) Jiang" <qiangjiang@google.com>
 Date: Wed, 12 Apr 2023 18:32:50 +0000
 Subject: [PATCH] DO NOT MERGE: Limit the ServiceFriendlyNames
@@ -13,10 +13,10 @@ Change-Id: Id4e16007531ba1ce3e3f9fa3d3111b5af57751be
  1 file changed, 17 insertions(+)
 
 diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java
-index 09f91d688f7ba..a6509e3e9fe10 100644
+index 9095b5d927a2..dd23e504c467 100644
 --- a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java
 +++ b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java
-@@ -842,6 +842,23 @@ private boolean validateForCommonR1andR2() {
+@@ -597,6 +597,23 @@ public final class PasspointConfiguration implements Parcelable {
                  }
              }
          }

Patches/LineageOS-17.1/android_frameworks_base/360959.patch

@@ -1,4 +1,4 @@
-From 9a334720003494e411ab0f0cfd66b3cc4cc104fb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aaron Liu <aaronjli@google.com>
 Date: Tue, 28 Mar 2023 13:15:04 -0700
 Subject: [PATCH] DO NOT MERGE Dismiss keyguard when simpin auth'd and...
@@ -25,10 +25,10 @@ Change-Id: If4360dd6ae2e5f79b43eaf1a29687ac9cc4b6101
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
-index b2020d9fe2d53..1cef61a2e18a1 100644
+index 89514a52d0bd..bd555e7360d8 100644
 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
 +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
-@@ -739,7 +739,7 @@ boolean showNextSecurityScreenOrFinish(boolean authenticated, int targetUserId,
+@@ -529,7 +529,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
                  case SimPuk:
                      // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
                      SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);

Patches/LineageOS-17.1/android_frameworks_base/360960.patch

@@ -1,4 +1,4 @@
-From 67b68368ef609a22b83b48d355cbef2e01480a88 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ioana Alexandru <aioana@google.com>
 Date: Fri, 28 Apr 2023 14:11:04 +0000
 Subject: [PATCH] DO NOT MERGE Increase notification channel limit.
@@ -16,10 +16,10 @@ Change-Id: Id8da382f812d4abb8db723c40a61366a7402da4f
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/notification/PreferencesHelper.java b/services/core/java/com/android/server/notification/PreferencesHelper.java
-index 8f969dc83a09c..282816079a262 100644
+index 1a3779f7c607..32d1e7e53b6b 100644
 --- a/services/core/java/com/android/server/notification/PreferencesHelper.java
 +++ b/services/core/java/com/android/server/notification/PreferencesHelper.java
-@@ -92,7 +92,7 @@ public class PreferencesHelper implements RankingConfig {
+@@ -73,7 +73,7 @@ public class PreferencesHelper implements RankingConfig {
      private static final String NON_BLOCKABLE_CHANNEL_DELIM = ":";
  
      @VisibleForTesting

Patches/LineageOS-17.1/android_frameworks_base/360962-backport.patch

@@ -64,7 +64,7 @@ index 58aacc2c36c7..4bd28aefc0a9 100644
  
          mUserId = source.readInt();
 -        mId = source.readString();
-+        mId = getSafeId(Preconditions.checkStringNotEmpty(source.readString8(),
++        mId = getSafeId(Preconditions.checkStringNotEmpty(source.readString(),
 +                "Shortcut ID must be provided"));
          mPackageName = source.readString();
          mActivity = source.readParcelable(cl);

Patches/LineageOS-17.1/android_frameworks_base/360963.patch

@@ -1,4 +1,4 @@
-From c7abcb66259f6ffc57f4b378d14b1999576ada03 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ioana Alexandru <aioana@google.com>
 Date: Thu, 27 Apr 2023 12:36:05 +0000
 Subject: [PATCH] Visit URIs in landscape/portrait custom remote views.
@@ -15,10 +15,10 @@ Change-Id: I7d3d35df0ec38945019f71755bed8797b7af4517
  2 files changed, 70 insertions(+)
 
 diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
-index a9b2c4df255f1..ec36b9ed578c6 100644
+index 86cec5e0f0a2..21d38b559736 100644
 --- a/core/java/android/widget/RemoteViews.java
 +++ b/core/java/android/widget/RemoteViews.java
-@@ -562,6 +562,12 @@ public void visitUris(@NonNull Consumer<Uri> visitor) {
+@@ -554,6 +554,12 @@ public class RemoteViews implements Parcelable, Filter {
                  mActions.get(i).visitUris(visitor);
              }
          }
@@ -32,10 +32,10 @@ index a9b2c4df255f1..ec36b9ed578c6 100644
  
      private static void visitIconUri(Icon icon, @NonNull Consumer<Uri> visitor) {
 diff --git a/core/tests/coretests/src/android/widget/RemoteViewsTest.java b/core/tests/coretests/src/android/widget/RemoteViewsTest.java
-index 8cb7e1b95245e..46f2c0928fc3d 100644
+index 8cb7e1b95245..46f2c0928fc3 100644
 --- a/core/tests/coretests/src/android/widget/RemoteViewsTest.java
 +++ b/core/tests/coretests/src/android/widget/RemoteViewsTest.java
-@@ -20,6 +20,10 @@
+@@ -20,6 +20,10 @@ import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertSame;
  import static org.junit.Assert.assertTrue;
@@ -46,7 +46,7 @@ index 8cb7e1b95245e..46f2c0928fc3d 100644
  
  import android.app.ActivityOptions;
  import android.app.PendingIntent;
-@@ -29,6 +33,8 @@
+@@ -29,6 +33,8 @@ import android.content.Intent;
  import android.graphics.Bitmap;
  import android.graphics.drawable.BitmapDrawable;
  import android.graphics.drawable.Drawable;
@@ -55,7 +55,7 @@ index 8cb7e1b95245e..46f2c0928fc3d 100644
  import android.os.AsyncTask;
  import android.os.Binder;
  import android.os.Parcel;
-@@ -50,6 +56,7 @@
+@@ -50,6 +56,7 @@ import org.junit.runner.RunWith;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.concurrent.CountDownLatch;
@@ -63,7 +63,7 @@ index 8cb7e1b95245e..46f2c0928fc3d 100644
  
  /**
   * Tests for RemoteViews.
-@@ -499,4 +506,61 @@ public ActivityOptions createSharedElementActivityOptions(
+@@ -499,4 +506,61 @@ public class RemoteViewsTest {
              return null;
          }
      }

Patches/LineageOS-17.1/android_system_bt/360969.patch

@@ -1,4 +1,4 @@
-From 785e4f3712e63acb5cb0b0d028609fcc268b9b78 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tyiu <tyiu@google.com>
 Date: Tue, 28 Mar 2023 18:40:51 +0000
 Subject: [PATCH] Fix gatt_end_operation buffer overflow
@@ -26,7 +26,7 @@ Change-Id: I49e2797cd9300ee4cd69f2c7fa5f0073db78b873
  1 file changed, 7 insertions(+)
 
 diff --git a/stack/gatt/gatt_utils.cc b/stack/gatt/gatt_utils.cc
-index 2bd42400013..013011778b0 100644
+index 2bd424000..013011778 100644
 --- a/stack/gatt/gatt_utils.cc
 +++ b/stack/gatt/gatt_utils.cc
 @@ -1198,6 +1198,13 @@ void gatt_end_operation(tGATT_CLCB* p_clcb, tGATT_STATUS status, void* p_data) {

Patches/LineageOS-17.1/android_system_nfc/360972.patch

@@ -1,4 +1,4 @@
-From ce05a2670c9ceb76b6ff5715d25331f2c59ddab6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Alisher Alikhodjaev <alisher@google.com>
 Date: Tue, 2 May 2023 14:20:57 -0700
 Subject: [PATCH] OOBW in rw_i93_send_to_upper()
@@ -13,10 +13,10 @@ Change-Id: I1d55954e56a3f995f8dd48bf484fe9fce02b2ed1
  1 file changed, 9 insertions(+)
 
 diff --git a/src/nfc/tags/rw_i93.cc b/src/nfc/tags/rw_i93.cc
-index 1c64ea84..cb6d96da 100644
+index 1483cdc..1f48c27 100644
 --- a/src/nfc/tags/rw_i93.cc
 +++ b/src/nfc/tags/rw_i93.cc
-@@ -578,6 +578,15 @@ void rw_i93_send_to_upper(NFC_HDR* p_resp) {
+@@ -516,6 +516,15 @@ void rw_i93_send_to_upper(NFC_HDR* p_resp) {
      case I93_CMD_GET_MULTI_BLK_SEC:
      case I93_CMD_EXT_GET_MULTI_BLK_SEC:
  

Patches/LineageOS-17.1/android_tools_apksig/360973-backport.patch

@@ -95,7 +95,7 @@ index f900211..6422af0 100644
  
  package com.android.apksig.internal.apk.v1;
  
-+import static com.android.apksig.Constants.MAX_APK_SIGNERS;
++//import static com.android.apksig.Constants.MAX_APK_SIGNERS;
 +
  import com.android.apksig.apk.ApkFormatException;
  import com.android.apksig.internal.asn1.Asn1DerEncoder;
@@ -104,9 +104,9 @@ index f900211..6422af0 100644
          if (signerConfigs.isEmpty()) {
              throw new IllegalArgumentException("At least one signer config must be provided");
          }
-+        if (signerConfigs.size() > MAX_APK_SIGNERS) {
++        if (signerConfigs.size() > 10) {
 +            throw new IllegalArgumentException(
-+                    "APK Signature Scheme v1 only supports a maximum of " + MAX_APK_SIGNERS + ", "
++                    "APK Signature Scheme v1 only supports a maximum of " + 10 + ", "
 +                            + signerConfigs.size() + " provided");
 +        }
          OutputManifestFile manifest =
@@ -120,7 +120,7 @@ index 47d5b01..615215c 100644
  
  package com.android.apksig.internal.apk.v1;
  
-+import static com.android.apksig.Constants.MAX_APK_SIGNERS;
++//import static com.android.apksig.Constants.MAX_APK_SIGNERS;
 +
  import com.android.apksig.ApkVerifier.Issue;
  import com.android.apksig.ApkVerifier.IssueWithParams;
@@ -129,8 +129,8 @@ index 47d5b01..615215c 100644
                  result.addError(Issue.JAR_SIG_NO_SIGNATURES);
                  return;
              }
-+            if (signers.size() > MAX_APK_SIGNERS) {
++            if (signers.size() > 10) {
-+                result.addError(Issue.JAR_SIG_MAX_SIGNATURES_EXCEEDED, MAX_APK_SIGNERS,
++                result.addError(Issue.JAR_SIG_MAX_SIGNATURES_EXCEEDED, 10,
 +                        signers.size());
 +                return;
 +            }
@@ -145,7 +145,7 @@ index d8e4723..03a0311 100644
  
  package com.android.apksig.internal.apk.v2;
  
-+import static com.android.apksig.Constants.MAX_APK_SIGNERS;
++//import static com.android.apksig.Constants.MAX_APK_SIGNERS;
  import static com.android.apksig.internal.apk.ApkSigningBlockUtils.encodeAsSequenceOfLengthPrefixedElements;
  import static com.android.apksig.internal.apk.ApkSigningBlockUtils.encodeAsSequenceOfLengthPrefixedPairsOfIntAndLengthPrefixedBytes;
  import static com.android.apksig.internal.apk.ApkSigningBlockUtils.encodeCertificates;
@@ -161,9 +161,9 @@ index d8e4723..03a0311 100644
          // FORMAT:
          // * length-prefixed sequence of length-prefixed signer blocks.
  
-+        if (signerConfigs.size() > MAX_APK_SIGNERS) {
++        if (signerConfigs.size() > 10) {
 +            throw new IllegalArgumentException(
-+                    "APK Signature Scheme v2 only supports a maximum of " + MAX_APK_SIGNERS + ", "
++                    "APK Signature Scheme v2 only supports a maximum of " + 10 + ", "
 +                            + signerConfigs.size() + " provided");
 +        }
 +
@@ -178,7 +178,7 @@ index 51c40bd..651ed5d 100644
  
  package com.android.apksig.internal.apk.v2;
  
-+import static com.android.apksig.Constants.MAX_APK_SIGNERS;
++//import static com.android.apksig.Constants.MAX_APK_SIGNERS;
 +
  import com.android.apksig.ApkVerifier.Issue;
  import com.android.apksig.apk.ApkFormatException;
@@ -187,8 +187,8 @@ index 51c40bd..651ed5d 100644
                  return;
              }
          }
-+        if (signerCount > MAX_APK_SIGNERS) {
++        if (signerCount > 10) {
-+            result.addError(Issue.V2_SIG_MAX_SIGNATURES_EXCEEDED, MAX_APK_SIGNERS, signerCount);
++            result.addError(Issue.V2_SIG_MAX_SIGNATURES_EXCEEDED, 10, signerCount);
 +        }
      }
  

Patches/LineageOS-17.1/android_vendor_nxp_opensource_commonsys_external_libnfc-nci/360974.patch

@@ -1,4 +1,4 @@
-From 17cb7edf8ad3aa239f39e4b823e881284f789343 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Alisher Alikhodjaev <alisher@google.com>
 Date: Tue, 2 May 2023 14:20:57 -0700
 Subject: [PATCH] OOBW in rw_i93_send_to_upper()
@@ -16,10 +16,10 @@ Change-Id: Ia10491e388a495a164462c73ced7ea1965808860
  2 files changed, 18 insertions(+)
 
 diff --git a/SN100x/src/nfc/tags/rw_i93.cc b/SN100x/src/nfc/tags/rw_i93.cc
-index f57ee763..062cc7e8 100755
+index 9eb4458f..5bf497ad 100755
 --- a/SN100x/src/nfc/tags/rw_i93.cc
 +++ b/SN100x/src/nfc/tags/rw_i93.cc
-@@ -598,6 +598,15 @@ void rw_i93_send_to_upper(NFC_HDR* p_resp) {
+@@ -467,6 +467,15 @@ void rw_i93_send_to_upper(NFC_HDR* p_resp) {
      case I93_CMD_GET_MULTI_BLK_SEC:
      case I93_CMD_EXT_GET_MULTI_BLK_SEC:
  
@@ -36,10 +36,10 @@ index f57ee763..062cc7e8 100755
        p_buff = (NFC_HDR*)GKI_getbuf((uint16_t)(length + NFC_HDR_SIZE));
  
 diff --git a/src/nfc/tags/rw_i93.cc b/src/nfc/tags/rw_i93.cc
-index f47fc30c..f58d7f58 100644
+index a648bb9a..a9c220d6 100644
 --- a/src/nfc/tags/rw_i93.cc
 +++ b/src/nfc/tags/rw_i93.cc
-@@ -598,6 +598,15 @@ void rw_i93_send_to_upper(NFC_HDR* p_resp) {
+@@ -528,6 +528,15 @@ void rw_i93_send_to_upper(NFC_HDR* p_resp) {
      case I93_CMD_GET_MULTI_BLK_SEC:
      case I93_CMD_EXT_GET_MULTI_BLK_SEC:
  

Patches/LineageOS-17.1/android_vendor_qcom_opensource_commonsys_system_bt/360975.patch

@@ -1,4 +1,4 @@
-From 35912b629815d6481deabe9fcbebac83722367a6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tyiu <tyiu@google.com>
 Date: Tue, 28 Mar 2023 18:40:51 +0000
 Subject: [PATCH] Fix gatt_end_operation buffer overflow

Scripts/LineageOS-17.1/Patch.sh

@@ -141,16 +141,16 @@ git fetch https://github.com/LineageOS/android_external_zlib refs/changes/70/352
 fi;
 
 if enterAndClear "frameworks/base"; then
-applyPatch "$DOS_PATCHES/android_frameworks_base/360952-backport.patch"; #R_asb_2023-07 Passpoint Add more check to limit the config size
+#applyPatch "$DOS_PATCHES/android_frameworks_base/360952-backport.patch"; #R_asb_2023-07 Passpoint Add more check to limit the config size #XXX: Passpoint 2.0 is API30+
 applyPatch "$DOS_PATCHES/android_frameworks_base/360953-backport.patch"; #R_asb_2023-07 Sanitize VPN label to prevent HTML injection
 applyPatch "$DOS_PATCHES/android_frameworks_base/360954.patch"; #R_asb_2023-07 Limit the number of supported v1 and v2 signers
 applyPatch "$DOS_PATCHES/android_frameworks_base/360955.patch"; #R_asb_2023-07 Import translations.
-applyPatch "$DOS_PATCHES/android_frameworks_base/360956.patch"; #R_asb_2023-07 Add size check on PPS#policy
+#applyPatch "$DOS_PATCHES/android_frameworks_base/360956.patch"; #R_asb_2023-07 Add size check on PPS#policy #XXX: depends on 360952
-applyPatch "$DOS_PATCHES/android_frameworks_base/360957.patch"; #R_asb_2023-07 Limit the ServiceFriendlyNames
+#applyPatch "$DOS_PATCHES/android_frameworks_base/360957.patch"; #R_asb_2023-07 Limit the ServiceFriendlyNames #XXX: depends on 360952
 applyPatch "$DOS_PATCHES/android_frameworks_base/360958-backport.patch"; #R_asb_2023-07 Only allow NEW_TASK flag when adjusting pending intents
 applyPatch "$DOS_PATCHES/android_frameworks_base/360959.patch"; #R_asb_2023-07 Dismiss keyguard when simpin auth'd and security method is none.
 applyPatch "$DOS_PATCHES/android_frameworks_base/360960.patch"; #R_asb_2023-07 Increase notification channel limit.
-applyPatch "$DOS_PATCHES/android_frameworks_base/360961-backport.patch"; #R_asb_2023-07 Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.
+#applyPatch "$DOS_PATCHES/android_frameworks_base/360961-backport.patch"; #R_asb_2023-07 Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. #XXX: RemoteInputHistoryItem doesn't exist
 applyPatch "$DOS_PATCHES/android_frameworks_base/360962-backport.patch"; #R_asb_2023-07 Truncate ShortcutInfo Id
 applyPatch "$DOS_PATCHES/android_frameworks_base/360963.patch"; #R_asb_2023-07 Visit URIs in landscape/portrait custom remote views.
 #applyPatch "$DOS_PATCHES/android_frameworks_base/272645.patch"; #ten-bt-sbc-hd-dualchannel: Add CHANNEL_MODE_DUAL_CHANNEL constant (ValdikSS)
@@ -223,7 +223,7 @@ fi;
 fi;
 
 if enterAndClear "frameworks/opt/net/wifi"; then
-#applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/360964-backport.patch"; #R_asb_2023-07 Add pre-share key check for wapi #XXX
+#applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/360964-backport.patch"; #R_asb_2023-07 Add pre-share key check for wapi #XXX: WAPI is API30+
 if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0002-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS)
 fi;
@@ -441,9 +441,9 @@ if enterAndClear "system/update_engine"; then
 git revert --no-edit c68499e3ff10f2a31f913e14f66aafb4ed94d42d; #Do not skip payload signature verification
 fi;
 
-if enterAndClear "tools/apksig"; then
+#if enterAndClear "tools/apksig"; then
-applyPatch "$DOS_PATCHES/android_tools_apksig/360973-backport.patch"; #R_asb_2023-07 Limit the number of supported v1 and v2 signers
+#applyPatch "$DOS_PATCHES/android_tools_apksig/360973-backport.patch"; #R_asb_2023-07 Limit the number of supported v1 and v2 signers #TODO backport containsWarnings for SignerInfo
-fi;
+#fi;
 
 if enterAndClear "vendor/lineage"; then
 rm build/target/product/security/lineage.x509.pem; #Remove Lineage keys