Merge "Add missing SmallTest annotations in frameworks/base/wifi"
diff --git a/Android.bp b/Android.bp
index 07b3018..970d66b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -151,6 +151,8 @@
         ":libcamera_client_framework_aidl",
         "core/java/android/hardware/IConsumerIrService.aidl",
         "core/java/android/hardware/ISerialManager.aidl",
+        "core/java/android/hardware/biometrics/IBiometricPromptService.aidl",
+        "core/java/android/hardware/biometrics/IBiometricPromptServiceReceiver.aidl",
         "core/java/android/hardware/biometrics/IBiometricPromptReceiver.aidl",
         "core/java/android/hardware/biometrics/IBiometricServiceLockoutResetCallback.aidl",
         "core/java/android/hardware/display/IDisplayManager.aidl",
@@ -790,9 +792,10 @@
     name: "platformprotos",
     srcs: [
         "cmds/am/proto/instrumentation_data.proto",
+        "cmds/statsd/src/**/*.proto",
         "core/proto/**/*.proto",
         "libs/incident/proto/**/*.proto",
-        "cmds/statsd/src/**/*.proto",
+        "proto/src/stats_enums.proto",
     ],
     proto: {
         include_dirs: ["external/protobuf/src"],
@@ -830,6 +833,7 @@
     srcs: [
         "core/proto/**/*.proto",
         "libs/incident/proto/android/os/**/*.proto",
+        "proto/src/stats_enums.proto",
     ],
     // Protos have lots of MissingOverride and similar.
     errorprone: {
@@ -855,6 +859,7 @@
     srcs: [
         "core/proto/**/*.proto",
         "libs/incident/**/*.proto",
+        "proto/src/stats_enums.proto",
     ],
 
     target: {
@@ -1179,6 +1184,48 @@
     create_stubs: false,
 }
 
+metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " +
+    "--hide-package com.android.okhttp " +
+    "--hide-package com.android.org.conscrypt --hide-package com.android.server " +
+    "--hide RequiresPermission " +
+    "--hide MissingPermission --hide BroadcastBehavior " +
+    "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
+    "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo"
+
+doc_defaults {
+    name: "metalava-api-stubs-default",
+    srcs: [
+        ":opt-telephony-srcs",
+        ":opt-net-voip-srcs",
+        ":openjdk_javadoc_files",
+        ":non_openjdk_javadoc_files",
+        ":android_icu4j_src_files_for_docs",
+    ],
+    srcs_lib: "framework",
+    srcs_lib_whitelist_dirs: frameworks_base_subdirs,
+    srcs_lib_whitelist_pkgs: packages_to_document,
+    libs: [
+        "core-oj",
+        "core-libart",
+        "conscrypt",
+        "bouncycastle",
+        "okhttp",
+        "ext",
+        "framework",
+        "voip-common",
+        "android.test.mock.impl",
+    ],
+    local_sourcepaths: frameworks_base_subdirs,
+    installable: false,
+    metalava_enabled: true,
+    metalava_annotations_enabled: true,
+    metalava_previous_api: ":last-released-public-api",
+    metalava_merge_annotations_dirs: [
+        "metalava-manual",
+        "ojluni-annotated-stubs",
+    ],
+}
+
 droiddoc {
     name: "doc-comment-check-docs",
     defaults: ["framework-docs-default"],
@@ -1406,26 +1453,21 @@
 }
 
 droiddoc {
-    name: "hiddenapi-lists",
-    defaults: ["api-stubs-default"],
+    name: "hiddenapi-lists-docs",
+    defaults: ["metalava-api-stubs-default"],
     arg_files: [
         "core/res/AndroidManifest.xml",
-        ":api-version-xml",
-        "core/java/overview.html",
-        ":current-support-api",
-        "api/current.txt",
     ],
     dex_api_filename: "public-dex.txt",
     private_dex_api_filename: "private-dex.txt",
     removed_dex_api_filename: "removed-dex.txt",
-    args: framework_docs_args +
-          " -referenceonly" +
-          " -nodocs" +
-          " -showUnannotated" +
-          " -showAnnotation android.annotation.SystemApi" +
-          " -showAnnotation android.annotation.TestApi",
+    args: metalava_framework_docs_args +
+        " --show-unannotated " +
+        " --show-annotation android.annotation.SystemApi " +
+        " --show-annotation android.annotation.TestApi "
 }
 
+
 droiddoc {
     name: "hiddenapi-mappings",
     defaults: ["api-stubs-default"],
@@ -1469,48 +1511,6 @@
     ],
 }
 
-metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " +
-    "--hide-package com.android.okhttp " +
-    "--hide-package com.android.org.conscrypt --hide-package com.android.server " +
-    "--hide RequiresPermission " +
-    "--hide MissingPermission --hide BroadcastBehavior " +
-    "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
-    "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo"
-
-doc_defaults {
-    name: "metalava-api-stubs-default",
-    srcs: [
-        ":opt-telephony-srcs",
-        ":opt-net-voip-srcs",
-        ":openjdk_javadoc_files",
-        ":non_openjdk_javadoc_files",
-        ":android_icu4j_src_files_for_docs",
-    ],
-    srcs_lib: "framework",
-    srcs_lib_whitelist_dirs: frameworks_base_subdirs,
-    srcs_lib_whitelist_pkgs: packages_to_document,
-    libs: [
-        "core-oj",
-        "core-libart",
-        "conscrypt",
-        "bouncycastle",
-        "okhttp",
-        "ext",
-        "framework",
-        "voip-common",
-        "android.test.mock.impl",
-    ],
-    local_sourcepaths: frameworks_base_subdirs,
-    installable: false,
-    metalava_enabled: true,
-    metalava_annotations_enabled: true,
-    metalava_previous_api: ":last-released-public-api",
-    metalava_merge_annotations_dirs: [
-        "metalava-manual",
-        "ojluni-annotated-stubs",
-    ],
-}
-
 droiddoc {
     name: "api-stubs-docs",
     defaults: ["metalava-api-stubs-default"],
@@ -1574,3 +1574,10 @@
         },
     },
 }
+
+filegroup {
+    name: "framework-annotation-nonnull-srcs",
+    srcs: [
+        "core/java/android/annotation/NonNull.java",
+    ],
+}
diff --git a/Android.mk b/Android.mk
index 29454e4..988c009 100644
--- a/Android.mk
+++ b/Android.mk
@@ -322,119 +322,34 @@
 	( unzip -qo $< -d $(OUT_DOCS)/offline-sdk && touch -f $@ ) || exit 1
 
 # ==== hiddenapi lists =======================================
-include $(CLEAR_VARS)
-
-# File names of final API lists
-LOCAL_LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)
-LOCAL_DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)
-LOCAL_BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
-
-# File names of source files we will use to generate the final API lists.
-LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt
-LOCAL_SRC_VENDOR_LIST := frameworks/base/config/hiddenapi-vendor-list.txt
-LOCAL_SRC_FORCE_BLACKLIST := frameworks/base/config/hiddenapi-force-blacklist.txt
-LOCAL_SRC_PUBLIC_API := $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST)
-LOCAL_SRC_PRIVATE_API := $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST)
-LOCAL_SRC_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)
-
-LOCAL_SRC_ALL := \
-	$(LOCAL_SRC_GREYLIST) \
-	$(LOCAL_SRC_VENDOR_LIST) \
-	$(LOCAL_SRC_FORCE_BLACKLIST) \
-	$(LOCAL_SRC_PUBLIC_API) \
-	$(LOCAL_SRC_PRIVATE_API) \
-	$(LOCAL_SRC_REMOVED_API)
-
-define assert-has-no-overlap
-if [ ! -z "`comm -12 <(sort $(1)) <(sort $(2))`" ]; then \
-	echo "$(1) and $(2) should not overlap" 1>&2; \
-	comm -12 <(sort $(1)) <(sort $(2)) 1>&2; \
-	exit 1; \
-fi
-endef
-
-define assert-is-subset
-if [ ! -z "`comm -23 <(sort $(1)) <(sort $(2))`" ]; then \
-	echo "$(1) must be a subset of $(2)" 1>&2; \
-	comm -23 <(sort $(1)) <(sort $(2)) 1>&2; \
-	exit 1; \
-fi
-endef
-
-define assert-has-no-duplicates
-if [ ! -z "`sort $(1) | uniq -D`" ]; then \
-	echo "$(1) has duplicate entries" 1>&2; \
-	sort $(1) | uniq -D 1>&2; \
-	exit 1; \
-fi
-endef
-
-# The following rules build API lists in the build folder.
-# By not using files from the source tree, ART buildbots can mock these lists
-# or have alternative rules for building them. Other rules in the build system
-# should depend on the files in the build folder.
-
-# Merge light greylist from multiple files:
-#  (1) manual greylist LOCAL_SRC_GREYLIST
-#  (2) list of usages from vendor apps LOCAL_SRC_VENDOR_LIST
-#  (3) list of removed APIs in LOCAL_SRC_REMOVED_API
-#      @removed does not imply private in Doclava. We must take the subset also
-#      in LOCAL_SRC_PRIVATE_API.
-#  (4) list of serialization APIs
-#      Automatically adds all methods which match the signatures in
-#      REGEX_SERIALIZATION. These are greylisted in order to allow applications
-#      to write their own serializers.
-$(LOCAL_LIGHT_GREYLIST): REGEX_SERIALIZATION := \
-    "readObject\(Ljava/io/ObjectInputStream;\)V" \
-    "readObjectNoData\(\)V" \
-    "readResolve\(\)Ljava/lang/Object;" \
-    "serialVersionUID:J" \
-    "serialPersistentFields:\[Ljava/io/ObjectStreamField;" \
-    "writeObject\(Ljava/io/ObjectOutputStream;\)V" \
-    "writeReplace\(\)Ljava/lang/Object;"
-$(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL)
-	sort $(LOCAL_SRC_GREYLIST) $(LOCAL_SRC_VENDOR_LIST) $(PRIVATE_GREYLIST_INPUTS) \
-	     <(grep -E "\->("$(subst $(space),"|",$(REGEX_SERIALIZATION))")$$" \
-	               $(LOCAL_SRC_PRIVATE_API)) \
-	     <(comm -12 <(sort $(LOCAL_SRC_REMOVED_API)) <(sort $(LOCAL_SRC_PRIVATE_API))) \
-	     > $@
-	$(call assert-has-no-duplicates,$@)
-	$(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
-	$(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST))
-
-# Generate dark greylist as remaining classes and class members in the same
-# package as classes listed in the light greylist.
-# The algorithm is as follows:
-#   (1) extract the class descriptor from each entry in LOCAL_LIGHT_GREYLIST
-#   (2) strip everything after the last forward-slash,
-#       e.g. 'Lpackage/subpackage/class$inner;' turns into 'Lpackage/subpackage/'
-#   (3) insert all entries from LOCAL_SRC_PRIVATE_API which begin with the package
-#       name but do not contain another forward-slash in the class name, e.g.
-#       matching '^Lpackage/subpackage/[^/;]*;'
-#   (4) subtract entries shared with LOCAL_LIGHT_GREYLIST
-$(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST)
-	comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_SRC_FORCE_BLACKLIST)) \
-	         <(cat $(LOCAL_SRC_PUBLIC_API) $(LOCAL_LIGHT_GREYLIST) | \
-	               sed 's/\->.*//' | sed 's/\(.*\/\).*/\1/' | sort | uniq | \
-	               while read PKG_NAME; do \
-	                   grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \
-	               done | sort | uniq) \
-	         > $@
-	$(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
-	$(call assert-has-no-duplicates,$@)
-	$(call assert-has-no-overlap,$@,$(LOCAL_LIGHT_GREYLIST))
-	$(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST))
-
-# Generate blacklist as private API minus (light greylist plus dark greylist).
-$(LOCAL_BLACKLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST) $(LOCAL_DARK_GREYLIST)
-	comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_DARK_GREYLIST)) \
-	         <(sort $(LOCAL_SRC_PRIVATE_API)) \
-	         > $@
-	$(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
-	$(call assert-has-no-duplicates,$@)
-	$(call assert-has-no-overlap,$@,$(LOCAL_LIGHT_GREYLIST))
-	$(call assert-has-no-overlap,$@,$(LOCAL_DARK_GREYLIST))
-	$(call assert-is-subset,$(LOCAL_SRC_FORCE_BLACKLIST),$@)
+$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \
+    .KATI_IMPLICIT_OUTPUTS := \
+        $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
+        $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \
+        $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
+$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \
+    frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \
+    frameworks/base/config/hiddenapi-light-greylist.txt \
+    frameworks/base/config/hiddenapi-vendor-list.txt \
+    frameworks/base/config/hiddenapi-force-blacklist.txt \
+    $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \
+    $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \
+    $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)
+	frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \
+	    --input-public $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \
+	    --input-private $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \
+	    --input-whitelists $(PRIVATE_WHITELIST_INPUTS) \
+	    --input-greylists \
+	        frameworks/base/config/hiddenapi-light-greylist.txt \
+	        frameworks/base/config/hiddenapi-vendor-list.txt \
+	        <(comm -12 <(sort $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)) \
+	                   $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST)) \
+	        $(PRIVATE_GREYLIST_INPUTS) \
+	    --input-blacklists frameworks/base/config/hiddenapi-force-blacklist.txt \
+	    --output-whitelist $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST) \
+	    --output-light-greylist $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
+	    --output-dark-greylist $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \
+	    --output-blacklist $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
 
 # Include subdirectory makefiles
 # ============================================================
diff --git a/apct-tests/perftests/core/src/android/app/ResourcesThemePerfTest.java b/apct-tests/perftests/core/src/android/app/ResourcesThemePerfTest.java
new file mode 100644
index 0000000..bb0627e
--- /dev/null
+++ b/apct-tests/perftests/core/src/android/app/ResourcesThemePerfTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.app;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.perftests.utils.BenchmarkState;
+import android.perftests.utils.PerfStatusReporter;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Benchmarks for {@link android.content.res.Resources.Theme}.
+ */
+@LargeTest
+public class ResourcesThemePerfTest {
+    @Rule
+    public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
+
+    private Resources.Theme mTheme;
+
+    @Before
+    public void setUp() {
+        Context context = InstrumentationRegistry.getTargetContext();
+        mTheme = context.getTheme();
+
+    }
+
+    @Test
+    public void obtainStyledAttributesForViewFromMaterial() {
+        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+        while (state.keepRunning()) {
+            mTheme.obtainStyledAttributes(android.R.style.Theme_Material, android.R.styleable.View);
+        }
+    }
+
+}
diff --git a/api/current.txt b/api/current.txt
old mode 100644
new mode 100755
index e9f5756..568f4c4
--- a/api/current.txt
+++ b/api/current.txt
@@ -57,8 +57,6 @@
     field public static final java.lang.String CALL_PRIVILEGED = "android.permission.CALL_PRIVILEGED";
     field public static final java.lang.String CAMERA = "android.permission.CAMERA";
     field public static final java.lang.String CAPTURE_AUDIO_OUTPUT = "android.permission.CAPTURE_AUDIO_OUTPUT";
-    field public static final java.lang.String CAPTURE_SECURE_VIDEO_OUTPUT = "android.permission.CAPTURE_SECURE_VIDEO_OUTPUT";
-    field public static final java.lang.String CAPTURE_VIDEO_OUTPUT = "android.permission.CAPTURE_VIDEO_OUTPUT";
     field public static final java.lang.String CHANGE_COMPONENT_ENABLED_STATE = "android.permission.CHANGE_COMPONENT_ENABLED_STATE";
     field public static final java.lang.String CHANGE_CONFIGURATION = "android.permission.CHANGE_CONFIGURATION";
     field public static final java.lang.String CHANGE_NETWORK_STATE = "android.permission.CHANGE_NETWORK_STATE";
@@ -103,7 +101,6 @@
     field public static final java.lang.String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
     field public static final java.lang.String READ_CONTACTS = "android.permission.READ_CONTACTS";
     field public static final deprecated java.lang.String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE";
-    field public static final java.lang.String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER";
     field public static final deprecated java.lang.String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";
     field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS";
     field public static final java.lang.String READ_MEDIA_AUDIO = "android.permission.READ_MEDIA_AUDIO";
@@ -3765,7 +3762,7 @@
     method public boolean onSearchRequested(android.view.SearchEvent);
     method public boolean onSearchRequested();
     method protected void onStart();
-    method public void onStateNotSaved();
+    method public deprecated void onStateNotSaved();
     method protected void onStop();
     method protected void onTitleChanged(java.lang.CharSequence, int);
     method public boolean onTouchEvent(android.view.MotionEvent);
@@ -8716,6 +8713,8 @@
     method public byte[] getServiceData();
     method public byte[] getServiceDataMask();
     method public android.os.ParcelUuid getServiceDataUuid();
+    method public android.os.ParcelUuid getServiceSolicitationUuid();
+    method public android.os.ParcelUuid getServiceSolicitationUuidMask();
     method public android.os.ParcelUuid getServiceUuid();
     method public android.os.ParcelUuid getServiceUuidMask();
     method public boolean matches(android.bluetooth.le.ScanResult);
@@ -8732,6 +8731,8 @@
     method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[], byte[]);
     method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[]);
     method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[], byte[]);
+    method public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(android.os.ParcelUuid);
+    method public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(android.os.ParcelUuid, android.os.ParcelUuid);
     method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid);
     method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid, android.os.ParcelUuid);
   }
@@ -8744,6 +8745,7 @@
     method public byte[] getManufacturerSpecificData(int);
     method public java.util.Map<android.os.ParcelUuid, byte[]> getServiceData();
     method public byte[] getServiceData(android.os.ParcelUuid);
+    method public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids();
     method public java.util.List<android.os.ParcelUuid> getServiceUuids();
     method public int getTxPowerLevel();
   }
@@ -11922,7 +11924,7 @@
     method public int[] getIntArray(int) throws android.content.res.Resources.NotFoundException;
     method public int getInteger(int) throws android.content.res.Resources.NotFoundException;
     method public android.content.res.XmlResourceParser getLayout(int) throws android.content.res.Resources.NotFoundException;
-    method public android.graphics.Movie getMovie(int) throws android.content.res.Resources.NotFoundException;
+    method public deprecated android.graphics.Movie getMovie(int) throws android.content.res.Resources.NotFoundException;
     method public java.lang.String getQuantityString(int, int, java.lang.Object...) throws android.content.res.Resources.NotFoundException;
     method public java.lang.String getQuantityString(int, int) throws android.content.res.Resources.NotFoundException;
     method public java.lang.CharSequence getQuantityText(int, int) throws android.content.res.Resources.NotFoundException;
@@ -37307,7 +37309,7 @@
     field public static final int RESULT_SMS_HANDLED = 1; // 0x1
     field public static final int RESULT_SMS_OUT_OF_MEMORY = 3; // 0x3
     field public static final int RESULT_SMS_UNSUPPORTED = 4; // 0x4
-    field public static final java.lang.String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE";
+    field public static final deprecated java.lang.String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE";
     field public static final java.lang.String SIM_FULL_ACTION = "android.provider.Telephony.SIM_FULL";
     field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED";
     field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER";
@@ -41061,8 +41063,9 @@
   public abstract class CallRedirectionService extends android.app.Service {
     ctor public CallRedirectionService();
     method public final void cancelCall();
-    method public android.os.IBinder onBind(android.content.Intent);
+    method public final android.os.IBinder onBind(android.content.Intent);
     method public abstract void onPlaceCall(android.net.Uri, android.telecom.PhoneAccountHandle);
+    method public final boolean onUnbind(android.content.Intent);
     method public final void placeCallUnmodified();
     method public final void redirectCall(android.net.Uri, android.telecom.PhoneAccountHandle);
     field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.CallRedirectionService";
@@ -41867,6 +41870,8 @@
     field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";
     field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";
     field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";
+    field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT = "carrier_default_wfc_ims_mode_int";
+    field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT = "carrier_default_wfc_ims_roaming_mode_int";
     field public static final java.lang.String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool";
     field public static final java.lang.String KEY_CARRIER_IMS_GBA_REQUIRED_BOOL = "carrier_ims_gba_required_bool";
     field public static final java.lang.String KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL = "carrier_instant_lettering_available_bool";
@@ -42722,6 +42727,7 @@
     method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
     method public boolean isConcurrentVoiceAndDataSupported();
     method public boolean isDataEnabled();
+    method public boolean isDataRoamingEnabled();
     method public boolean isHearingAidCompatibilitySupported();
     method public boolean isNetworkRoaming();
     method public boolean isSmsCapable();
@@ -42748,6 +42754,7 @@
     field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";
     field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
     field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
+    field public static final java.lang.String ACTION_SECRET_CODE = "android.telephony.action.SECRET_CODE";
     field public static final java.lang.String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";
     field public static final java.lang.String ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED = "android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED";
     field public static final int APPTYPE_CSIM = 4; // 0x4
@@ -45422,6 +45429,7 @@
     field public static final int DENSITY_420 = 420; // 0x1a4
     field public static final int DENSITY_440 = 440; // 0x1b8
     field public static final int DENSITY_560 = 560; // 0x230
+    field public static final int DENSITY_600 = 600; // 0x258
     field public static final int DENSITY_DEFAULT = 160; // 0xa0
     field public static final int DENSITY_DEVICE_STABLE;
     field public static final int DENSITY_HIGH = 240; // 0xf0
@@ -53014,14 +53022,33 @@
   public final class Magnifier {
     ctor public Magnifier(android.view.View);
     method public void dismiss();
+    method public float getCornerRadius();
+    method public int getDefaultHorizontalSourceToMagnifierOffset();
+    method public int getDefaultVerticalSourceToMagnifierOffset();
+    method public float getElevation();
     method public int getHeight();
+    method public android.graphics.Point getPosition();
+    method public int getSourceHeight();
+    method public android.graphics.Point getSourcePosition();
+    method public int getSourceWidth();
     method public int getWidth();
     method public float getZoom();
+    method public void setZoom(float);
     method public void show(float, float);
     method public void show(float, float, float, float);
     method public void update();
   }
 
+  public static class Magnifier.Builder {
+    ctor public Magnifier.Builder(android.view.View);
+    method public android.widget.Magnifier build();
+    method public android.widget.Magnifier.Builder setCornerRadius(float);
+    method public android.widget.Magnifier.Builder setDefaultSourceToMagnifierOffset(int, int);
+    method public android.widget.Magnifier.Builder setElevation(float);
+    method public android.widget.Magnifier.Builder setSize(int, int);
+    method public android.widget.Magnifier.Builder setZoom(float);
+  }
+
   public class MediaController extends android.widget.FrameLayout {
     ctor public MediaController(android.content.Context, android.util.AttributeSet);
     ctor public MediaController(android.content.Context, boolean);
diff --git a/api/system-current.txt b/api/system-current.txt
index 72cf0c7..1d5f586 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -46,9 +46,7 @@
     field public static final java.lang.String CAMERA_DISABLE_TRANSMIT_LED = "android.permission.CAMERA_DISABLE_TRANSMIT_LED";
     field public static final java.lang.String CAPTURE_AUDIO_HOTWORD = "android.permission.CAPTURE_AUDIO_HOTWORD";
     field public static final java.lang.String CAPTURE_AUDIO_OUTPUT = "android.permission.CAPTURE_AUDIO_OUTPUT";
-    field public static final java.lang.String CAPTURE_SECURE_VIDEO_OUTPUT = "android.permission.CAPTURE_SECURE_VIDEO_OUTPUT";
     field public static final java.lang.String CAPTURE_TV_INPUT = "android.permission.CAPTURE_TV_INPUT";
-    field public static final java.lang.String CAPTURE_VIDEO_OUTPUT = "android.permission.CAPTURE_VIDEO_OUTPUT";
     field public static final java.lang.String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE";
     field public static final java.lang.String CHANGE_COMPONENT_ENABLED_STATE = "android.permission.CHANGE_COMPONENT_ENABLED_STATE";
     field public static final java.lang.String CHANGE_CONFIGURATION = "android.permission.CHANGE_CONFIGURATION";
@@ -134,7 +132,6 @@
     field public static final java.lang.String QUERY_TIME_ZONE_RULES = "android.permission.QUERY_TIME_ZONE_RULES";
     field public static final java.lang.String READ_CONTENT_RATING_SYSTEMS = "android.permission.READ_CONTENT_RATING_SYSTEMS";
     field public static final java.lang.String READ_DREAM_STATE = "android.permission.READ_DREAM_STATE";
-    field public static final java.lang.String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER";
     field public static final java.lang.String READ_INSTALL_SESSIONS = "android.permission.READ_INSTALL_SESSIONS";
     field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS";
     field public static final java.lang.String READ_NETWORK_USAGE_HISTORY = "android.permission.READ_NETWORK_USAGE_HISTORY";
@@ -216,11 +213,24 @@
     field public static final int userRestriction = 16844164; // 0x1010584
   }
 
+  public static final class R.bool {
+    field public static final int config_sendPackageName = 17891328; // 0x1110000
+  }
+
   public static final class R.raw {
     field public static final int loaderror = 17825792; // 0x1100000
     field public static final int nodomain = 17825793; // 0x1100001
   }
 
+  public static final class R.string {
+    field public static final int config_feedback_intent_extra_key = 17039391; // 0x104001f
+    field public static final int config_feedback_intent_name_key = 17039392; // 0x1040020
+    field public static final int config_help_intent_extra_key = 17039389; // 0x104001d
+    field public static final int config_help_intent_name_key = 17039390; // 0x104001e
+    field public static final int config_help_package_name_key = 17039387; // 0x104001b
+    field public static final int config_help_package_name_value = 17039388; // 0x104001c
+  }
+
   public static final class R.style {
     field public static final int Theme_Leanback_FormWizard = 16974544; // 0x10302d0
   }
@@ -361,9 +371,11 @@
     method public final void attachBaseContext(android.content.Context);
     method public final android.os.IBinder onBind(android.content.Intent);
     method public deprecated void onGetInstantAppIntentFilter(int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
-    method public void onGetInstantAppIntentFilter(android.content.Intent, int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
+    method public deprecated void onGetInstantAppIntentFilter(android.content.Intent, int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
+    method public void onGetInstantAppIntentFilter(android.content.Intent, int[], android.os.UserHandle, java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
     method public deprecated void onGetInstantAppResolveInfo(int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
-    method public void onGetInstantAppResolveInfo(android.content.Intent, int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
+    method public deprecated void onGetInstantAppResolveInfo(android.content.Intent, int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
+    method public void onGetInstantAppResolveInfo(android.content.Intent, int[], android.os.UserHandle, java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
   }
 
   public static final class InstantAppResolverService.InstantAppResolutionCallback {
@@ -503,9 +515,11 @@
     method public android.content.ComponentName getDeviceOwnerComponentOnAnyUser();
     method public java.lang.String getDeviceOwnerNameOnAnyUser();
     method public java.lang.CharSequence getDeviceOwnerOrganizationName();
+    method public int getDeviceOwnerUserId();
     method public java.util.List<java.lang.String> getPermittedAccessibilityServices(int);
     method public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();
     method public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException;
+    method public android.content.ComponentName getProfileOwnerAsUser(int);
     method public java.lang.String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException;
     method public int getUserProvisioningState();
     method public boolean isDeviceManaged();
@@ -527,6 +541,7 @@
     field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL";
     field public static final java.lang.String EXTRA_PROVISIONING_ORGANIZATION_NAME = "android.app.extra.PROVISIONING_ORGANIZATION_NAME";
     field public static final java.lang.String EXTRA_PROVISIONING_SUPPORT_URL = "android.app.extra.PROVISIONING_SUPPORT_URL";
+    field public static final java.lang.String EXTRA_RESTRICTION = "android.app.extra.RESTRICTION";
     field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4
     field public static final int STATE_USER_SETUP_COMPLETE = 2; // 0x2
     field public static final int STATE_USER_SETUP_FINALIZED = 3; // 0x3
@@ -921,6 +936,7 @@
     method public abstract void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);
     method public abstract void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.os.Bundle);
     method public abstract void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+    method public void startActivityAsUser(android.content.Intent, android.os.UserHandle);
     field public static final java.lang.String BACKUP_SERVICE = "backup";
     field public static final java.lang.String CONTEXTHUB_SERVICE = "contexthub";
     field public static final java.lang.String EUICC_CARD_SERVICE = "euicc_card";
@@ -986,6 +1002,7 @@
     field public static final java.lang.String EXTRA_REMOTE_CALLBACK = "android.intent.extra.REMOTE_CALLBACK";
     field public static final java.lang.String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";
     field public static final java.lang.String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP";
+    field public static final java.lang.String EXTRA_USER_ID = "android.intent.extra.USER_ID";
     field public static final java.lang.String EXTRA_VERIFICATION_BUNDLE = "android.intent.extra.VERIFICATION_BUNDLE";
   }
 
@@ -4083,10 +4100,12 @@
     method public boolean isSystem();
     method public static int myUserId();
     method public static android.os.UserHandle of(int);
+    field public static final int USER_NULL = -10000; // 0xffffd8f0
   }
 
   public class UserManager {
     method public void clearSeedAccountData();
+    method public int[] getProfileIds(int, boolean);
     method public java.lang.String getSeedAccountName();
     method public android.os.PersistableBundle getSeedAccountOptions();
     method public java.lang.String getSeedAccountType();
@@ -4360,6 +4379,7 @@
 
   public final class Settings {
     field public static final java.lang.String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";
+    field public static final java.lang.String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";
   }
 
   public static final class Settings.Global extends android.provider.Settings.NameValueTable {
@@ -4545,11 +4565,9 @@
   public abstract class AutofillFieldClassificationService extends android.app.Service {
     method public android.os.IBinder onBind(android.content.Intent);
     method public float[][] onGetScores(java.lang.String, android.os.Bundle, java.util.List<android.view.autofill.AutofillValue>, java.util.List<java.lang.String>);
-    field public static final java.lang.String RESOURCE_AVAILABLE_ALGORITHMS = "autofill_field_classification_available_algorithms";
-    field public static final java.lang.String RESOURCE_DEFAULT_ALGORITHM = "autofill_field_classification_default_algorithm";
     field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillFieldClassificationService";
-    field public static final deprecated java.lang.String SERVICE_META_DATA_KEY_AVAILABLE_ALGORITHMS = "android.autofill.field_classification.available_algorithms";
-    field public static final deprecated java.lang.String SERVICE_META_DATA_KEY_DEFAULT_ALGORITHM = "android.autofill.field_classification.default_algorithm";
+    field public static final java.lang.String SERVICE_META_DATA_KEY_AVAILABLE_ALGORITHMS = "android.autofill.field_classification.available_algorithms";
+    field public static final java.lang.String SERVICE_META_DATA_KEY_DEFAULT_ALGORITHM = "android.autofill.field_classification.default_algorithm";
   }
 
 }
@@ -5389,16 +5407,17 @@
     method public boolean handlePinMmi(java.lang.String);
     method public boolean handlePinMmiForSubscriber(int, java.lang.String);
     method public boolean isDataConnectivityPossible();
-    method public boolean isIdle();
-    method public boolean isOffhook();
-    method public boolean isRadioOn();
-    method public boolean isRinging();
+    method public deprecated boolean isIdle();
+    method public deprecated boolean isOffhook();
+    method public deprecated boolean isRadioOn();
+    method public deprecated boolean isRinging();
     method public boolean isVideoCallingEnabled();
     method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
     method public boolean needsOtaServiceProvisioning();
     method public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);
     method public void setDataActivationState(int);
     method public deprecated void setDataEnabled(int, boolean);
+    method public void setDataRoamingEnabled(boolean);
     method public boolean setRadio(boolean);
     method public boolean setRadioPower(boolean);
     method public void setSimPowerState(int);
@@ -5916,6 +5935,7 @@
     field public static final int CODE_NETWORK_DETACH = 1513; // 0x5e9
     field public static final int CODE_NETWORK_REJECT = 1504; // 0x5e0
     field public static final int CODE_NETWORK_RESP_TIMEOUT = 1503; // 0x5df
+    field public static final int CODE_NO_CSFB_IN_CS_ROAM = 1516; // 0x5ec
     field public static final int CODE_NO_VALID_SIM = 1501; // 0x5dd
     field public static final int CODE_OEM_CAUSE_1 = 61441; // 0xf001
     field public static final int CODE_OEM_CAUSE_10 = 61450; // 0xf00a
@@ -5985,6 +6005,7 @@
     field public static final int CODE_SIP_SERVICE_UNAVAILABLE = 352; // 0x160
     field public static final int CODE_SIP_TEMPRARILY_UNAVAILABLE = 336; // 0x150
     field public static final int CODE_SIP_TRANSACTION_DOES_NOT_EXIST = 343; // 0x157
+    field public static final int CODE_SIP_USER_MARKED_UNWANTED = 365; // 0x16d
     field public static final int CODE_SIP_USER_REJECTED = 361; // 0x169
     field public static final int CODE_SUPP_SVC_CANCELLED = 1202; // 0x4b2
     field public static final int CODE_SUPP_SVC_FAILED = 1201; // 0x4b1
diff --git a/api/test-current.txt b/api/test-current.txt
index f6cda32..0f89dfd 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -40,6 +40,10 @@
     method public abstract void onUidImportance(int, int);
   }
 
+  public static class ActivityManager.RunningAppProcessInfo implements android.os.Parcelable {
+    field public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170; // 0xaa
+  }
+
   public static class ActivityManager.TaskDescription implements android.os.Parcelable {
     method public java.lang.String getIconFilename();
     method public int getIconResource();
@@ -331,6 +335,10 @@
 
 package android.database.sqlite {
 
+  public class SQLiteCompatibilityWalFlags {
+    method public static void reset();
+  }
+
   public final class SQLiteDebug {
     method public static void dump(android.util.Printer, java.lang.String[]);
     method public static android.database.sqlite.SQLiteDebug.PagerStats getDatabaseInfo();
@@ -1590,7 +1598,7 @@
   public final class Magnifier {
     method public android.graphics.Bitmap getContent();
     method public static android.graphics.PointF getMagnifierDefaultSize();
-    method public android.graphics.Rect getWindowPositionOnScreen();
+    method public android.graphics.Bitmap getOriginalContent();
     method public void setOnOperationCompleteCallback(android.widget.Magnifier.Callback);
   }
 
diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp
index 91d68ea..9a79345 100644
--- a/cmds/statsd/src/StatsService.cpp
+++ b/cmds/statsd/src/StatsService.cpp
@@ -1009,7 +1009,7 @@
     ALOGW("statscompanion service died");
     StatsdStats::getInstance().noteSystemServerRestart(getWallClockSec());
     if (mProcessor != nullptr) {
-        ALOGW("Reset statsd upon system server restars.");
+        ALOGW("Reset statsd upon system server restarts.");
         mProcessor->WriteDataToDisk(STATSCOMPANION_DIED);
         mProcessor->resetConfigs();
     }
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index 6065bbf..3c9f7ee 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -29,6 +29,7 @@
 import "frameworks/base/core/proto/android/telecomm/enums.proto";
 import "frameworks/base/core/proto/android/telephony/enums.proto";
 import "frameworks/base/core/proto/android/view/enums.proto";
+import "frameworks/base/proto/src/stats_enums.proto";
 
 /**
  * The master atom class. This message defines all of the available
@@ -128,6 +129,7 @@
         LowMemReported low_mem_reported = 81;
         GenericAtom generic_atom = 82;
         KeyValuePairsAtom key_value_pairs_atom = 83;
+        VibratorStateChanged vibrator_state_changed = 84;
     }
 
     // Pulled events will start at field 10000.
@@ -1410,6 +1412,25 @@
     optional ForegroundState foreground_state = 6;
 }
 
+/**
+ * Logs when the vibrator state changes.
+ * Logged from:
+ *      frameworks/base/services/core/java/com/android/server/VibratorService.java
+ */
+message VibratorStateChanged {
+    repeated AttributionNode attribution_node = 1;
+
+    enum State {
+        OFF = 0;
+        ON = 1;
+    }
+    optional State state = 2;
+
+    // Duration (in milliseconds) requested to keep the vibrator on.
+    // Only applicable for State == ON.
+    optional int64 duration_millis = 3;
+}
+
 /*
  * Allows other apps to push events into statsd.
  * Logged from:
@@ -1750,7 +1771,7 @@
     optional int32 uid = 1 [(is_uid) = true];
 
     // An event_id indicates the type of event.
-    optional int32 event_id = 2;
+    optional android.os.statsd.EventType event_id = 2;
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/config/boot-image-profile.txt b/config/boot-image-profile.txt
index 9ca0745..cdcdc46 100644
--- a/config/boot-image-profile.txt
+++ b/config/boot-image-profile.txt
@@ -1753,12 +1753,6 @@
 HPLandroid/content/pm/LauncherApps$CallbackMessageHandler;->postOnPackageChanged(Ljava/lang/String;Landroid/os/UserHandle;)V
 HPLandroid/content/pm/LauncherApps$CallbackMessageHandler;->postOnPackageRemoved(Ljava/lang/String;Landroid/os/UserHandle;)V
 HPLandroid/content/pm/LauncherApps$ShortcutQuery;->setActivity(Landroid/content/ComponentName;)Landroid/content/pm/LauncherApps$ShortcutQuery;
-HPLandroid/content/pm/PackageCleanItem$1;-><init>()V
-HPLandroid/content/pm/PackageCleanItem$1;->createFromParcel(Landroid/os/Parcel;)Landroid/content/pm/PackageCleanItem;
-HPLandroid/content/pm/PackageCleanItem$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-HPLandroid/content/pm/PackageCleanItem;-><init>(ILjava/lang/String;Z)V
-HPLandroid/content/pm/PackageCleanItem;->equals(Ljava/lang/Object;)Z
-HPLandroid/content/pm/PackageCleanItem;->writeToParcel(Landroid/os/Parcel;I)V
 HPLandroid/content/pm/PackageInfo$1;->newArray(I)[Landroid/content/pm/PackageInfo;
 HPLandroid/content/pm/PackageInfo$1;->newArray(I)[Ljava/lang/Object;
 HPLandroid/content/pm/PackageInfo;->isOverlayPackage()Z
@@ -6651,7 +6645,6 @@
 HPLandroid/view/SurfaceControl$Transaction;->setAnimationTransaction()Landroid/view/SurfaceControl$Transaction;
 HPLandroid/view/SurfaceControl$Transaction;->setColor(Landroid/view/SurfaceControl;[F)Landroid/view/SurfaceControl$Transaction;
 HPLandroid/view/SurfaceControl$Transaction;->setEarlyWakeup()Landroid/view/SurfaceControl$Transaction;
-HPLandroid/view/SurfaceControl$Transaction;->setFinalCrop(Landroid/view/SurfaceControl;Landroid/graphics/Rect;)Landroid/view/SurfaceControl$Transaction;
 HPLandroid/view/SurfaceControl$Transaction;->setGeometryAppliesWithResize(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction;
 HPLandroid/view/SurfaceControl$Transaction;->setMatrix(Landroid/view/SurfaceControl;Landroid/graphics/Matrix;[F)Landroid/view/SurfaceControl$Transaction;
 HPLandroid/view/SurfaceControl$Transaction;->setOpaque(Landroid/view/SurfaceControl;Z)Landroid/view/SurfaceControl$Transaction;
@@ -18113,7 +18106,6 @@
 HSPLandroid/content/pm/IPackageManager;->logAppProcessStartIfNeeded(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V
 HSPLandroid/content/pm/IPackageManager;->movePackage(Ljava/lang/String;Ljava/lang/String;)I
 HSPLandroid/content/pm/IPackageManager;->movePrimaryStorage(Ljava/lang/String;)I
-HSPLandroid/content/pm/IPackageManager;->nextPackageToClean(Landroid/content/pm/PackageCleanItem;)Landroid/content/pm/PackageCleanItem;
 HSPLandroid/content/pm/IPackageManager;->notifyDexLoad(Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V
 HSPLandroid/content/pm/IPackageManager;->notifyPackageUse(Ljava/lang/String;I)V
 HSPLandroid/content/pm/IPackageManager;->performDexOptMode(Ljava/lang/String;ZLjava/lang/String;ZZLjava/lang/String;)Z
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt
index 196f89c..a4f13a0 100644
--- a/config/hiddenapi-light-greylist.txt
+++ b/config/hiddenapi-light-greylist.txt
@@ -1,14 +1,11 @@
-Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;-><init>()V
 Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accessibilityservice/IAccessibilityServiceConnection;
 Landroid/accounts/IAccountAuthenticator$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/accounts/IAccountAuthenticator$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/accounts/IAccountAuthenticator$Stub;-><init>()V
 Landroid/accounts/IAccountAuthenticator$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountAuthenticator;
 Landroid/accounts/IAccountAuthenticator;->addAccount(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/os/Bundle;)V
-Landroid/accounts/IAccountAuthenticator;->addAccountFromCredentials(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Landroid/os/Bundle;)V
 Landroid/accounts/IAccountAuthenticator;->confirmCredentials(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Landroid/os/Bundle;)V
 Landroid/accounts/IAccountAuthenticator;->editProperties(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;)V
-Landroid/accounts/IAccountAuthenticator;->getAccountCredentialsForCloning(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;)V
 Landroid/accounts/IAccountAuthenticator;->getAccountRemovalAllowed(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;)V
 Landroid/accounts/IAccountAuthenticator;->getAuthToken(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;)V
 Landroid/accounts/IAccountAuthenticator;->getAuthTokenLabel(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;)V
@@ -51,9 +48,6 @@
 Landroid/app/backup/IFullBackupRestoreObserver$Stub;-><init>()V
 Landroid/app/backup/IRestoreObserver$Stub;-><init>()V
 Landroid/app/DownloadManager;->restartDownload([J)V
-Landroid/app/IActivityController;->activityResuming(Ljava/lang/String;)Z
-Landroid/app/IActivityController;->activityStarting(Landroid/content/Intent;Ljava/lang/String;)Z
-Landroid/app/IActivityController;->appNotResponding(Ljava/lang/String;ILjava/lang/String;)I
 Landroid/app/IActivityManager$Stub$Proxy;->getConfiguration()Landroid/content/res/Configuration;
 Landroid/app/IActivityManager$Stub$Proxy;->getLaunchedFromUid(Landroid/os/IBinder;)I
 Landroid/app/IActivityManager$Stub$Proxy;->getProcessLimit()I
@@ -66,7 +60,6 @@
 Landroid/app/IActivityManager;->bindService(Landroid/app/IApplicationThread;Landroid/os/IBinder;Landroid/content/Intent;Ljava/lang/String;Landroid/app/IServiceConnection;ILjava/lang/String;I)I
 Landroid/app/IActivityManager;->broadcastIntent(Landroid/app/IApplicationThread;Landroid/content/Intent;Ljava/lang/String;Landroid/content/IIntentReceiver;ILjava/lang/String;Landroid/os/Bundle;[Ljava/lang/String;ILandroid/os/Bundle;ZZI)I
 Landroid/app/IActivityManager;->checkPermission(Ljava/lang/String;II)I
-Landroid/app/IActivityManager;->enterSafeMode()V
 Landroid/app/IActivityManager;->finishActivity(Landroid/os/IBinder;ILandroid/content/Intent;I)Z
 Landroid/app/IActivityManager;->finishHeavyWeightApp()V
 Landroid/app/IActivityManager;->finishReceiver(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/Bundle;ZI)V
@@ -92,7 +85,6 @@
 Landroid/app/IActivityManager;->isTopOfTask(Landroid/os/IBinder;)Z
 Landroid/app/IActivityManager;->isUserRunning(II)Z
 Landroid/app/IActivityManager;->killAllBackgroundProcesses()V
-Landroid/app/IActivityManager;->killApplicationProcess(Ljava/lang/String;I)V
 Landroid/app/IActivityManager;->killBackgroundProcesses(Ljava/lang/String;I)V
 Landroid/app/IActivityManager;->moveActivityTaskToBack(Landroid/os/IBinder;Z)Z
 Landroid/app/IActivityManager;->moveTaskToFront(IILandroid/os/Bundle;)V
@@ -135,7 +127,6 @@
 Landroid/app/IActivityManager;->stopUser(IZLandroid/app/IStopUserCallback;)I
 Landroid/app/IActivityManager;->suppressResizeConfigChanges(Z)V
 Landroid/app/IActivityManager;->switchUser(I)Z
-Landroid/app/IActivityManager;->unbindBackupAgent(Landroid/content/pm/ApplicationInfo;)V
 Landroid/app/IActivityManager;->unbindService(Landroid/app/IServiceConnection;)Z
 Landroid/app/IActivityManager;->unhandledBack()V
 Landroid/app/IActivityManager;->unlockUser(I[B[BLandroid/os/IProgressListener;)Z
@@ -145,32 +136,23 @@
 Landroid/app/IActivityManager;->updateConfiguration(Landroid/content/res/Configuration;)Z
 Landroid/app/IActivityManager;->updatePersistentConfiguration(Landroid/content/res/Configuration;)V
 Landroid/app/IAlarmManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/IAlarmManager$Stub;-><init>()V
 Landroid/app/IAlarmManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IAlarmManager;
 Landroid/app/IAlarmManager$Stub;->TRANSACTION_remove:I
 Landroid/app/IAlarmManager$Stub;->TRANSACTION_set:I
 Landroid/app/IAlarmManager;->getNextAlarmClock(I)Landroid/app/AlarmManager$AlarmClockInfo;
 Landroid/app/IAlarmManager;->set(Ljava/lang/String;IJJJILandroid/app/PendingIntent;Landroid/app/IAlarmListener;Ljava/lang/String;Landroid/os/WorkSource;Landroid/app/AlarmManager$AlarmClockInfo;)V
-Landroid/app/IApplicationThread;->processInBackground()V
 Landroid/app/IApplicationThread;->scheduleBindService(Landroid/os/IBinder;Landroid/content/Intent;ZI)V
 Landroid/app/IApplicationThread;->scheduleCreateService(Landroid/os/IBinder;Landroid/content/pm/ServiceInfo;Landroid/content/res/CompatibilityInfo;I)V
-Landroid/app/IApplicationThread;->scheduleExit()V
-Landroid/app/IApplicationThread;->scheduleLowMemory()V
 Landroid/app/IApplicationThread;->scheduleStopService(Landroid/os/IBinder;)V
-Landroid/app/IApplicationThread;->scheduleSuicide()V
 Landroid/app/IApplicationThread;->scheduleTrimMemory(I)V
 Landroid/app/IApplicationThread;->scheduleUnbindService(Landroid/os/IBinder;Landroid/content/Intent;)V
-Landroid/app/IApplicationThread;->updateTimeZone()V
 Landroid/app/IAppTask;->getTaskInfo()Landroid/app/ActivityManager$RecentTaskInfo;
-Landroid/app/IBackupAgent$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IBackupAgent;
 Landroid/app/IInputForwarder;->forwardEvent(Landroid/view/InputEvent;)Z
 Landroid/app/IInstrumentationWatcher$Stub;-><init>()V
 Landroid/app/IInstrumentationWatcher$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IInstrumentationWatcher;
-Landroid/app/IInstrumentationWatcher;->instrumentationFinished(Landroid/content/ComponentName;ILandroid/os/Bundle;)V
 Landroid/app/IInstrumentationWatcher;->instrumentationStatus(Landroid/content/ComponentName;ILandroid/os/Bundle;)V
 Landroid/app/INotificationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/app/INotificationManager$Stub$Proxy;->areNotificationsEnabledForPackage(Ljava/lang/String;I)Z
-Landroid/app/INotificationManager$Stub;-><init>()V
 Landroid/app/INotificationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/INotificationManager;
 Landroid/app/INotificationManager$Stub;->TRANSACTION_enqueueNotificationWithTag:I
 Landroid/app/INotificationManager;->areNotificationsEnabledForPackage(Ljava/lang/String;I)Z
@@ -198,13 +180,11 @@
 Landroid/app/IStopUserCallback$Stub;-><init>()V
 Landroid/app/IStopUserCallback;->userStopped(I)V
 Landroid/app/ITransientNotification$Stub;-><init>()V
-Landroid/app/ITransientNotification;->hide()V
 Landroid/app/ITransientNotification;->show(Landroid/os/IBinder;)V
 Landroid/app/IUiModeManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/app/IUiModeManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IUiModeManager;
 Landroid/app/IUiModeManager;->disableCarMode(I)V
 Landroid/app/IUserSwitchObserver$Stub;-><init>()V
-Landroid/app/IWallpaperManager$Stub;-><init>()V
 Landroid/app/IWallpaperManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IWallpaperManager;
 Landroid/app/IWallpaperManager;->getHeightHint()I
 Landroid/app/IWallpaperManager;->getWallpaper(Ljava/lang/String;Landroid/app/IWallpaperManagerCallback;ILandroid/os/Bundle;I)Landroid/os/ParcelFileDescriptor;
@@ -213,7 +193,6 @@
 Landroid/app/IWallpaperManager;->hasNamedWallpaper(Ljava/lang/String;)Z
 Landroid/app/IWallpaperManager;->setWallpaperComponent(Landroid/content/ComponentName;)V
 Landroid/app/IWallpaperManagerCallback$Stub;-><init>()V
-Landroid/app/IWallpaperManagerCallback;->onWallpaperChanged()V
 Landroid/app/job/IJobCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/app/job/IJobCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/app/job/IJobCallback$Stub;-><init>()V
@@ -235,14 +214,6 @@
 Landroid/app/PackageInstallObserver;-><init>()V
 Landroid/app/ResourcesManager$ActivityResources;-><init>()V
 Landroid/app/ResourcesManager;-><init>()V
-Landroid/app/servertransaction/ActivityResultItem;->mResultInfoList:Ljava/util/List;
-Landroid/app/servertransaction/ClientTransaction;->getActivityToken()Landroid/os/IBinder;
-Landroid/app/servertransaction/ClientTransaction;->getCallbacks()Ljava/util/List;
-Landroid/app/servertransaction/ClientTransaction;->getLifecycleStateRequest()Landroid/app/servertransaction/ActivityLifecycleItem;
-Landroid/app/servertransaction/ClientTransaction;->mActivityCallbacks:Ljava/util/List;
-Landroid/app/servertransaction/LaunchActivityItem;->mInfo:Landroid/content/pm/ActivityInfo;
-Landroid/app/servertransaction/LaunchActivityItem;->mIntent:Landroid/content/Intent;
-Landroid/app/servertransaction/NewIntentItem;->mIntents:Ljava/util/List;
 Landroid/app/TaskStackListener;-><init>()V
 Landroid/app/trust/ITrustManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/app/UiAutomationConnection;-><init>()V
@@ -307,7 +278,6 @@
 Landroid/content/IIntentReceiver$Stub;-><init>()V
 Landroid/content/IIntentReceiver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentReceiver;
 Landroid/content/IIntentReceiver;->performReceive(Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;ZZI)V
-Landroid/content/IIntentSender$Stub;-><init>()V
 Landroid/content/IIntentSender$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentSender;
 Landroid/content/IOnPrimaryClipChangedListener$Stub;-><init>()V
 Landroid/content/IOnPrimaryClipChangedListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IOnPrimaryClipChangedListener;
@@ -378,7 +348,6 @@
 Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo;
 Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackagesForUid(I)[Ljava/lang/String;
 Landroid/content/pm/IPackageManager$Stub$Proxy;->getSystemSharedLibraryNames()[Ljava/lang/String;
-Landroid/content/pm/IPackageManager$Stub;-><init>()V
 Landroid/content/pm/IPackageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageManager;
 Landroid/content/pm/IPackageManager$Stub;->TRANSACTION_getApplicationInfo:I
 Landroid/content/pm/IPackageManager;->addPermission(Landroid/content/pm/PermissionInfo;)Z
@@ -386,12 +355,10 @@
 Landroid/content/pm/IPackageManager;->canonicalToCurrentPackageNames([Ljava/lang/String;)[Ljava/lang/String;
 Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;I)I
 Landroid/content/pm/IPackageManager;->checkSignatures(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/content/pm/IPackageManager;->checkUidPermission(Ljava/lang/String;I)I
 Landroid/content/pm/IPackageManager;->checkUidSignatures(II)I
 Landroid/content/pm/IPackageManager;->clearPackagePreferredActivities(Ljava/lang/String;)V
 Landroid/content/pm/IPackageManager;->currentToCanonicalPackageNames([Ljava/lang/String;)[Ljava/lang/String;
 Landroid/content/pm/IPackageManager;->deleteApplicationCacheFiles(Ljava/lang/String;Landroid/content/pm/IPackageDataObserver;)V
-Landroid/content/pm/IPackageManager;->enterSafeMode()V
 Landroid/content/pm/IPackageManager;->getApplicationEnabledSetting(Ljava/lang/String;I)I
 Landroid/content/pm/IPackageManager;->getAppOpPermissionPackages(Ljava/lang/String;)[Ljava/lang/String;
 Landroid/content/pm/IPackageManager;->getBlockUninstallForUser(Ljava/lang/String;I)Z
@@ -420,7 +387,6 @@
 Landroid/content/pm/IPackageManager;->grantRuntimePermission(Ljava/lang/String;Ljava/lang/String;I)V
 Landroid/content/pm/IPackageManager;->hasSystemUidErrors()Z
 Landroid/content/pm/IPackageManager;->isPackageAvailable(Ljava/lang/String;I)Z
-Landroid/content/pm/IPackageManager;->isProtectedBroadcast(Ljava/lang/String;)Z
 Landroid/content/pm/IPackageManager;->isSafeMode()Z
 Landroid/content/pm/IPackageManager;->isStorageLow()Z
 Landroid/content/pm/IPackageManager;->isUidPrivileged(I)Z
@@ -436,7 +402,6 @@
 Landroid/content/pm/IPackageManager;->setInstallerPackageName(Ljava/lang/String;Ljava/lang/String;)V
 Landroid/content/pm/IPackageManager;->setLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;ILandroid/content/IntentFilter;ILandroid/content/ComponentName;)V
 Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;ZI)V
-Landroid/content/pm/IPackageManager;->systemReady()V
 Landroid/content/pm/IPackageMoveObserver$Stub;-><init>()V
 Landroid/content/pm/IPackageMoveObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageMoveObserver;
 Landroid/content/pm/IPackageStatsObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
@@ -453,8 +418,6 @@
 Landroid/database/IContentObserver$Stub;-><init>()V
 Landroid/database/IContentObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/database/IContentObserver;
 Landroid/database/IContentObserver;->onChange(ZLandroid/net/Uri;I)V
-Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_VENDOR_BASE:I
-Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_VENDOR_BASE:I
 Landroid/hardware/display/IDisplayManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/display/IDisplayManager;
 Landroid/hardware/display/IDisplayManager;->getDisplayInfo(I)Landroid/view/DisplayInfo;
 Landroid/hardware/fingerprint/IFingerprintService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
@@ -513,10 +476,12 @@
 Landroid/location/ILocationListener;->onProviderEnabled(Ljava/lang/String;)V
 Landroid/location/ILocationListener;->onStatusChanged(Ljava/lang/String;ILandroid/os/Bundle;)V
 Landroid/location/ILocationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/location/ILocationManager$Stub;-><init>()V
 Landroid/location/ILocationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ILocationManager;
 Landroid/location/ILocationManager$Stub;->TRANSACTION_getAllProviders:I
 Landroid/location/ILocationManager;->getAllProviders()Ljava/util/List;
+Landroid/Manifest$permission;->CAPTURE_SECURE_VIDEO_OUTPUT:Ljava/lang/String;
+Landroid/Manifest$permission;->CAPTURE_VIDEO_OUTPUT:Ljava/lang/String;
+Landroid/Manifest$permission;->READ_FRAME_BUFFER:Ljava/lang/String;
 Landroid/media/IAudioFocusDispatcher;->dispatchAudioFocusChange(ILjava/lang/String;)V
 Landroid/media/IAudioRoutesObserver$Stub;-><init>()V
 Landroid/media/IAudioService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
@@ -546,7 +511,6 @@
 Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableUsbRegexs()[Ljava/lang/String;
 Landroid/net/IConnectivityManager$Stub$Proxy;->getTetheredIfaces()[Ljava/lang/String;
 Landroid/net/IConnectivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/net/IConnectivityManager$Stub;-><init>()V
 Landroid/net/IConnectivityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IConnectivityManager;
 Landroid/net/IConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;
 Landroid/net/IConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo;
@@ -586,7 +550,6 @@
 Landroid/net/nsd/INsdManager;->getMessenger()Landroid/os/Messenger;
 Landroid/net/SntpClient;-><init>()V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/net/wifi/IWifiManager$Stub;-><init>()V
 Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager;
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getScanResults:I
 Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network;
@@ -792,8 +755,6 @@
 Landroid/os/Handler;->mCallback:Landroid/os/Handler$Callback;
 Landroid/os/Handler;->mLooper:Landroid/os/Looper;
 Landroid/os/Handler;->mMessenger:Landroid/os/IMessenger;
-Landroid/os/health/SystemHealthManager;-><init>()V
-Landroid/os/health/SystemHealthManager;->from(Landroid/content/Context;)Landroid/os/health/SystemHealthManager;
 Landroid/os/HwParcel;-><init>(Z)V
 Landroid/os/HwRemoteBinder;-><init>()V
 Landroid/os/IBatteryPropertiesRegistrar$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
@@ -816,11 +777,9 @@
 Landroid/os/INetworkManagementService;->tetherInterface(Ljava/lang/String;)V
 Landroid/os/INetworkManagementService;->untetherInterface(Ljava/lang/String;)V
 Landroid/os/IPermissionController$Stub$Proxy;->checkPermission(Ljava/lang/String;II)Z
-Landroid/os/IPermissionController$Stub;-><init>()V
 Landroid/os/IPermissionController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPermissionController;
 Landroid/os/IPowerManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/os/IPowerManager$Stub$Proxy;->isLightDeviceIdleMode()Z
-Landroid/os/IPowerManager$Stub;-><init>()V
 Landroid/os/IPowerManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPowerManager;
 Landroid/os/IPowerManager$Stub;->TRANSACTION_acquireWakeLock:I
 Landroid/os/IPowerManager$Stub;->TRANSACTION_goToSleep:I
@@ -979,98 +938,10 @@
 Landroid/os/SharedMemory;->getFd()I
 Landroid/os/ShellCommand;->peekNextArg()Ljava/lang/String;
 Landroid/os/StatFs;->mStat:Landroid/system/StructStatVfs;
-Landroid/os/storage/DiskInfo;-><init>(Landroid/os/Parcel;)V
-Landroid/os/storage/DiskInfo;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/os/storage/DiskInfo;->flags:I
-Landroid/os/storage/DiskInfo;->getDescription()Ljava/lang/String;
-Landroid/os/storage/DiskInfo;->isAdoptable()Z
-Landroid/os/storage/DiskInfo;->isDefaultPrimary()Z
-Landroid/os/storage/DiskInfo;->isSd()Z
-Landroid/os/storage/DiskInfo;->isUsb()Z
-Landroid/os/storage/DiskInfo;->label:Ljava/lang/String;
-Landroid/os/storage/DiskInfo;->size:J
 Landroid/os/storage/IObbActionListener$Stub;-><init>()V
 Landroid/os/storage/IObbActionListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IObbActionListener;
 Landroid/os/storage/IStorageManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/os/storage/IStorageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IStorageManager;
-Landroid/os/storage/StorageEventListener;->onDiskDestroyed(Landroid/os/storage/DiskInfo;)V
-Landroid/os/storage/StorageEventListener;->onDiskScanned(Landroid/os/storage/DiskInfo;I)V
-Landroid/os/storage/StorageEventListener;->onStorageStateChanged(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-Landroid/os/storage/StorageEventListener;->onUsbMassStorageConnectionChanged(Z)V
-Landroid/os/storage/StorageEventListener;->onVolumeForgotten(Ljava/lang/String;)V
-Landroid/os/storage/StorageEventListener;->onVolumeRecordChanged(Landroid/os/storage/VolumeRecord;)V
-Landroid/os/storage/StorageEventListener;->onVolumeStateChanged(Landroid/os/storage/VolumeInfo;II)V
-Landroid/os/storage/StorageManager;-><init>(Landroid/content/Context;Landroid/os/Looper;)V
-Landroid/os/storage/StorageManager;->CRYPT_TYPE_DEFAULT:I
-Landroid/os/storage/StorageManager;->CRYPT_TYPE_PASSWORD:I
-Landroid/os/storage/StorageManager;->disableUsbMassStorage()V
-Landroid/os/storage/StorageManager;->enableUsbMassStorage()V
-Landroid/os/storage/StorageManager;->ENCRYPTION_STATE_NONE:I
-Landroid/os/storage/StorageManager;->findDiskById(Ljava/lang/String;)Landroid/os/storage/DiskInfo;
-Landroid/os/storage/StorageManager;->findEmulatedForPrivate(Landroid/os/storage/VolumeInfo;)Landroid/os/storage/VolumeInfo;
-Landroid/os/storage/StorageManager;->findVolumeByUuid(Ljava/lang/String;)Landroid/os/storage/VolumeInfo;
-Landroid/os/storage/StorageManager;->format(Ljava/lang/String;)V
-Landroid/os/storage/StorageManager;->getBestVolumeDescription(Landroid/os/storage/VolumeInfo;)Ljava/lang/String;
-Landroid/os/storage/StorageManager;->getDisks()Ljava/util/List;
-Landroid/os/storage/StorageManager;->getPrimaryPhysicalVolume()Landroid/os/storage/VolumeInfo;
-Landroid/os/storage/StorageManager;->getStorageBytesUntilLow(Ljava/io/File;)J
-Landroid/os/storage/StorageManager;->getStorageFullBytes(Ljava/io/File;)J
-Landroid/os/storage/StorageManager;->getStorageLowBytes(Ljava/io/File;)J
-Landroid/os/storage/StorageManager;->getStorageVolume([Landroid/os/storage/StorageVolume;Ljava/io/File;)Landroid/os/storage/StorageVolume;
-Landroid/os/storage/StorageManager;->getVolumeList(II)[Landroid/os/storage/StorageVolume;
-Landroid/os/storage/StorageManager;->getVolumePaths()[Ljava/lang/String;
-Landroid/os/storage/StorageManager;->getVolumes()Ljava/util/List;
-Landroid/os/storage/StorageManager;->getVolumeState(Ljava/lang/String;)Ljava/lang/String;
-Landroid/os/storage/StorageManager;->isFileEncryptedNativeOnly()Z
-Landroid/os/storage/StorageManager;->isUsbMassStorageConnected()Z
-Landroid/os/storage/StorageManager;->isUsbMassStorageEnabled()Z
-Landroid/os/storage/StorageManager;->partitionPublic(Ljava/lang/String;)V
-Landroid/os/storage/StorageManager;->unmount(Ljava/lang/String;)V
-Landroid/os/storage/StorageVolume;->allowMassStorage()Z
-Landroid/os/storage/StorageVolume;->getFatVolumeId()I
-Landroid/os/storage/StorageVolume;->getMaxFileSize()J
-Landroid/os/storage/StorageVolume;->getOwner()Landroid/os/UserHandle;
-Landroid/os/storage/StorageVolume;->getPathFile()Ljava/io/File;
-Landroid/os/storage/StorageVolume;->getUserLabel()Ljava/lang/String;
-Landroid/os/storage/StorageVolume;->mDescription:Ljava/lang/String;
-Landroid/os/storage/StorageVolume;->mId:Ljava/lang/String;
-Landroid/os/storage/StorageVolume;->mPath:Ljava/io/File;
-Landroid/os/storage/StorageVolume;->mPrimary:Z
-Landroid/os/storage/StorageVolume;->mRemovable:Z
-Landroid/os/storage/VolumeInfo;-><init>(Landroid/os/Parcel;)V
-Landroid/os/storage/VolumeInfo;->buildBrowseIntent()Landroid/content/Intent;
-Landroid/os/storage/VolumeInfo;->buildStableMtpStorageId(Ljava/lang/String;)I
-Landroid/os/storage/VolumeInfo;->buildStorageVolume(Landroid/content/Context;IZ)Landroid/os/storage/StorageVolume;
-Landroid/os/storage/VolumeInfo;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/os/storage/VolumeInfo;->disk:Landroid/os/storage/DiskInfo;
-Landroid/os/storage/VolumeInfo;->fsLabel:Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->fsUuid:Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->getDescription()Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->getDisk()Landroid/os/storage/DiskInfo;
-Landroid/os/storage/VolumeInfo;->getDiskId()Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->getEnvironmentForState(I)Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->getFsUuid()Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->getInternalPath()Ljava/io/File;
-Landroid/os/storage/VolumeInfo;->getInternalPathForUser(I)Ljava/io/File;
-Landroid/os/storage/VolumeInfo;->getMountUserId()I
-Landroid/os/storage/VolumeInfo;->getPath()Ljava/io/File;
-Landroid/os/storage/VolumeInfo;->getPathForUser(I)Ljava/io/File;
-Landroid/os/storage/VolumeInfo;->getState()I
-Landroid/os/storage/VolumeInfo;->getType()I
-Landroid/os/storage/VolumeInfo;->internalPath:Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->isMountedReadable()Z
-Landroid/os/storage/VolumeInfo;->isMountedWritable()Z
-Landroid/os/storage/VolumeInfo;->isPrimary()Z
-Landroid/os/storage/VolumeInfo;->isPrimaryPhysical()Z
-Landroid/os/storage/VolumeInfo;->isVisible()Z
-Landroid/os/storage/VolumeInfo;->isVisibleForWrite(I)Z
-Landroid/os/storage/VolumeInfo;->path:Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->state:I
-Landroid/os/storage/VolumeInfo;->type:I
-Landroid/os/storage/VolumeInfo;->TYPE_EMULATED:I
-Landroid/os/storage/VolumeInfo;->TYPE_PUBLIC:I
-Landroid/os/storage/VolumeRecord;-><init>(Landroid/os/Parcel;)V
-Landroid/os/storage/VolumeRecord;->CREATOR:Landroid/os/Parcelable$Creator;
 Landroid/os/StrictMode$Span;->finish()V
 Landroid/os/StrictMode$ThreadPolicy;->mask:I
 Landroid/os/StrictMode$VmPolicy$Builder;->mMask:I
@@ -1147,7 +1018,6 @@
 Landroid/os/UserHandle;->USER_ALL:I
 Landroid/os/UserHandle;->USER_CURRENT:I
 Landroid/os/UserHandle;->USER_CURRENT_OR_SELF:I
-Landroid/os/UserHandle;->USER_NULL:I
 Landroid/os/UserHandle;->USER_OWNER:I
 Landroid/os/UserHandle;->USER_SERIAL_SYSTEM:I
 Landroid/os/UserHandle;->USER_SYSTEM:I
@@ -1516,7 +1386,6 @@
 Landroid/service/wallpaper/IWallpaperEngine;->destroy()V
 Landroid/service/wallpaper/IWallpaperEngine;->dispatchPointer(Landroid/view/MotionEvent;)V
 Landroid/service/wallpaper/IWallpaperEngine;->dispatchWallpaperCommand(Ljava/lang/String;IIILandroid/os/Bundle;)V
-Landroid/service/wallpaper/IWallpaperEngine;->setDesiredSize(II)V
 Landroid/service/wallpaper/IWallpaperEngine;->setVisibility(Z)V
 Landroid/service/wallpaper/IWallpaperService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/wallpaper/IWallpaperService;
 Landroid/speech/IRecognitionListener;->onEvent(ILandroid/os/Bundle;)V
@@ -1578,44 +1447,23 @@
 Landroid/system/StructTimeval;->fromMillis(J)Landroid/system/StructTimeval;
 Landroid/telephony/CarrierMessagingServiceManager;-><init>()V
 Landroid/telephony/TelephonyManager$MultiSimVariants;->values()[Landroid/telephony/TelephonyManager$MultiSimVariants;
-Landroid/transition/ChangeBounds;->BOTTOM_RIGHT_ONLY_PROPERTY:Landroid/util/Property;
-Landroid/transition/ChangeBounds;->POSITION_PROPERTY:Landroid/util/Property;
-Landroid/transition/Scene;->mEnterAction:Ljava/lang/Runnable;
-Landroid/transition/Scene;->mExitAction:Ljava/lang/Runnable;
-Landroid/transition/Scene;->setCurrentScene(Landroid/view/View;Landroid/transition/Scene;)V
-Landroid/transition/Transition;->cancel()V
-Landroid/transition/Transition;->end()V
-Landroid/transition/Transition;->getRunningAnimators()Landroid/util/ArrayMap;
-Landroid/transition/TransitionManager;->getRunningTransitions()Landroid/util/ArrayMap;
-Landroid/transition/TransitionManager;->sPendingTransitions:Ljava/util/ArrayList;
-Landroid/transition/TransitionManager;->sRunningTransitions:Ljava/lang/ThreadLocal;
 Landroid/util/Singleton;-><init>()V
 Landroid/view/accessibility/IAccessibilityInteractionConnectionCallback;->setFindAccessibilityNodeInfoResult(Landroid/view/accessibility/AccessibilityNodeInfo;I)V
 Landroid/view/accessibility/IAccessibilityInteractionConnectionCallback;->setFindAccessibilityNodeInfosResult(Ljava/util/List;I)V
 Landroid/view/accessibility/IAccessibilityInteractionConnectionCallback;->setPerformAccessibilityActionResult(ZI)V
 Landroid/view/accessibility/IAccessibilityManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/view/accessibility/IAccessibilityManager$Stub;-><init>()V
 Landroid/view/accessibility/IAccessibilityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/accessibility/IAccessibilityManager;
 Landroid/view/accessibility/IAccessibilityManager;->getEnabledAccessibilityServiceList(II)Ljava/util/List;
 Landroid/view/AccessibilityIterators$AbstractTextSegmentIterator;-><init>()V
 Landroid/view/autofill/IAutoFillManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/view/autofill/IAutoFillManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/autofill/IAutoFillManager;
-Landroid/view/IApplicationToken$Stub;-><init>()V
 Landroid/view/IDockedStackListener$Stub;-><init>()V
 Landroid/view/IGraphicsStats$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/view/IGraphicsStats$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IGraphicsStats;
-Landroid/view/IOnKeyguardExitResult;->onKeyguardExitResult(Z)V
 Landroid/view/IRecentsAnimationController;->setAnimationTargetsBehindSystemBars(Z)V
 Landroid/view/IRotationWatcher$Stub;-><init>()V
-Landroid/view/IRotationWatcher;->onRotationChanged(I)V
 Landroid/view/IWindow$Stub;-><init>()V
 Landroid/view/IWindow$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IWindow;
-Landroid/view/IWindow;->closeSystemDialogs(Ljava/lang/String;)V
-Landroid/view/IWindow;->dispatchAppVisibility(Z)V
-Landroid/view/IWindow;->dispatchGetNewSurface()V
-Landroid/view/IWindow;->dispatchWallpaperCommand(Ljava/lang/String;IIILandroid/os/Bundle;Z)V
-Landroid/view/IWindow;->dispatchWallpaperOffsets(FFFFZ)V
-Landroid/view/IWindow;->windowFocusChanged(ZZ)V
 Landroid/view/IWindowManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/view/IWindowManager$Stub$Proxy;->getBaseDisplayDensity(I)I
 Landroid/view/IWindowManager$Stub$Proxy;->getDockedStackSide()I
@@ -1634,7 +1482,6 @@
 Landroid/view/IWindowManager;->getInitialDisplaySize(ILandroid/graphics/Point;)V
 Landroid/view/IWindowManager;->getPendingAppTransition()I
 Landroid/view/IWindowManager;->hasNavigationBar()Z
-Landroid/view/IWindowManager;->inputMethodClientHasFocus(Lcom/android/internal/view/IInputMethodClient;)Z
 Landroid/view/IWindowManager;->isKeyguardLocked()Z
 Landroid/view/IWindowManager;->isKeyguardSecure()Z
 Landroid/view/IWindowManager;->isSafeModeEnabled()Z
@@ -1649,7 +1496,6 @@
 Landroid/view/IWindowManager;->showStrictModeViolation(Z)V
 Landroid/view/IWindowManager;->thawRotation()V
 Landroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I
-Landroid/view/IWindowSession$Stub;-><init>()V
 Landroid/view/IWindowSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IWindowSession;
 Landroid/view/IWindowSession;->finishDrawing(Landroid/view/IWindow;)V
 Landroid/view/IWindowSession;->getInTouchMode()Z
@@ -1720,32 +1566,15 @@
 Lcom/android/internal/app/IAppOpsService;->resetAllModes(ILjava/lang/String;)V
 Lcom/android/internal/app/IAppOpsService;->setMode(IILjava/lang/String;I)V
 Lcom/android/internal/app/IBatteryStats$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/app/IBatteryStats$Stub;-><init>()V
 Lcom/android/internal/app/IBatteryStats$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IBatteryStats;
 Lcom/android/internal/app/IBatteryStats;->computeChargeTimeRemaining()J
 Lcom/android/internal/app/IBatteryStats;->getAwakeTimeBattery()J
 Lcom/android/internal/app/IBatteryStats;->getStatistics()[B
 Lcom/android/internal/app/IBatteryStats;->isCharging()Z
-Lcom/android/internal/app/IBatteryStats;->noteFullWifiLockAcquired(I)V
-Lcom/android/internal/app/IBatteryStats;->noteFullWifiLockReleased(I)V
-Lcom/android/internal/app/IBatteryStats;->notePhoneDataConnectionState(IZ)V
-Lcom/android/internal/app/IBatteryStats;->notePhoneOff()V
-Lcom/android/internal/app/IBatteryStats;->notePhoneOn()V
-Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
-Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
-Lcom/android/internal/app/IBatteryStats;->noteScreenBrightness(I)V
-Lcom/android/internal/app/IBatteryStats;->noteStartSensor(II)V
-Lcom/android/internal/app/IBatteryStats;->noteStopSensor(II)V
-Lcom/android/internal/app/IBatteryStats;->noteUserActivity(II)V
-Lcom/android/internal/app/IBatteryStats;->noteWifiMulticastDisabled(I)V
-Lcom/android/internal/app/IBatteryStats;->noteWifiMulticastEnabled(I)V
 Lcom/android/internal/app/IMediaContainerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IMediaContainerService;
 Lcom/android/internal/app/IVoiceInteractionManagerService$Stub$Proxy;->showSessionFromSession(Landroid/os/IBinder;Landroid/os/Bundle;I)Z
 Lcom/android/internal/app/IVoiceInteractionManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IVoiceInteractionManagerService;
 Lcom/android/internal/app/IVoiceInteractionManagerService;->getKeyphraseSoundModel(ILjava/lang/String;)Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseSoundModel;
-Lcom/android/internal/appwidget/IAppWidgetHost;->providerChanged(ILandroid/appwidget/AppWidgetProviderInfo;)V
-Lcom/android/internal/appwidget/IAppWidgetHost;->updateAppWidget(ILandroid/widget/RemoteViews;)V
-Lcom/android/internal/appwidget/IAppWidgetService$Stub;-><init>()V
 Lcom/android/internal/appwidget/IAppWidgetService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/appwidget/IAppWidgetService;
 Lcom/android/internal/appwidget/IAppWidgetService$Stub;->TRANSACTION_bindAppWidgetId:I
 Lcom/android/internal/appwidget/IAppWidgetService;->bindAppWidgetId(Ljava/lang/String;IILandroid/content/ComponentName;Landroid/os/Bundle;)Z
@@ -1753,15 +1582,6 @@
 Lcom/android/internal/appwidget/IAppWidgetService;->getAppWidgetIds(Landroid/content/ComponentName;)[I
 Lcom/android/internal/appwidget/IAppWidgetService;->getAppWidgetViews(Ljava/lang/String;I)Landroid/widget/RemoteViews;
 Lcom/android/internal/backup/IBackupTransport$Stub;-><init>()V
-Lcom/android/internal/backup/IBackupTransport$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/backup/IBackupTransport;
-Lcom/android/internal/backup/IBackupTransport;->clearBackupData(Landroid/content/pm/PackageInfo;)I
-Lcom/android/internal/backup/IBackupTransport;->finishBackup()I
-Lcom/android/internal/backup/IBackupTransport;->finishRestore()V
-Lcom/android/internal/backup/IBackupTransport;->getRestoreData(Landroid/os/ParcelFileDescriptor;)I
-Lcom/android/internal/backup/IBackupTransport;->initializeDevice()I
-Lcom/android/internal/backup/IBackupTransport;->requestBackupTime()J
-Lcom/android/internal/backup/IBackupTransport;->startRestore(J[Landroid/content/pm/PackageInfo;)I
-Lcom/android/internal/backup/IBackupTransport;->transportDirName()Ljava/lang/String;
 Lcom/android/internal/location/ILocationProvider$Stub;-><init>()V
 Lcom/android/internal/logging/MetricsLogger;-><init>()V
 Lcom/android/internal/net/LegacyVpnInfo;-><init>()V
@@ -2033,7 +1853,6 @@
 Lcom/android/internal/R$styleable;->AndroidManifest_sharedUserId:I
 Lcom/android/internal/R$styleable;->AndroidManifest_versionCode:I
 Lcom/android/internal/R$styleable;->AndroidManifest_versionName:I
-Lcom/android/internal/R$styleable;->AppWidgetProviderInfo:[I
 Lcom/android/internal/R$styleable;->AutoCompleteTextView:[I
 Lcom/android/internal/R$styleable;->CheckBoxPreference:[I
 Lcom/android/internal/R$styleable;->CheckBoxPreference_disableDependentsState:I
@@ -2223,7 +2042,6 @@
 Lcom/android/internal/R$styleable;->View_longClickable:I
 Lcom/android/internal/R$styleable;->WallpaperPreviewInfo:[I
 Lcom/android/internal/R$styleable;->Window:[I
-Lcom/android/internal/R$styleable;->WindowAnimation:[I
 Lcom/android/internal/R$styleable;->Window_windowActionBarFullscreenDecorLayout:I
 Lcom/android/internal/R$styleable;->Window_windowBackground:I
 Lcom/android/internal/R$styleable;->Window_windowFullscreen:I
@@ -2242,59 +2060,10 @@
 Lcom/android/internal/statusbar/IStatusBarService;->setIconVisibility(Ljava/lang/String;Z)V
 Lcom/android/internal/telecom/ITelecomService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telecom/ITelecomService;
 Lcom/android/internal/telecom/ITelecomService;->getCallState()I
-Lcom/android/internal/telephony/CallerInfo;-><init>()V
-Lcom/android/internal/telephony/CallerInfo;->contactIdOrZero:J
-Lcom/android/internal/telephony/CallerInfo;->getCallerInfo(Landroid/content/Context;Landroid/net/Uri;)Lcom/android/internal/telephony/CallerInfo;
-Lcom/android/internal/telephony/CallerInfo;->getCallerInfo(Landroid/content/Context;Ljava/lang/String;)Lcom/android/internal/telephony/CallerInfo;
-Lcom/android/internal/telephony/CallerInfo;->getCallerInfo(Landroid/content/Context;Ljava/lang/String;I)Lcom/android/internal/telephony/CallerInfo;
-Lcom/android/internal/telephony/CallerInfo;->name:Ljava/lang/String;
-Lcom/android/internal/telephony/CallerInfo;->numberLabel:Ljava/lang/String;
-Lcom/android/internal/telephony/CallerInfo;->numberType:I
-Lcom/android/internal/telephony/CallerInfo;->phoneNumber:Ljava/lang/String;
-Lcom/android/internal/telephony/EncodeException;-><init>(C)V
-Lcom/android/internal/telephony/EncodeException;-><init>(Ljava/lang/String;)V
-Lcom/android/internal/telephony/GsmAlphabet$LanguagePairCount;-><init>(I)V
-Lcom/android/internal/telephony/GsmAlphabet$LanguagePairCount;->languageCode:I
-Lcom/android/internal/telephony/GsmAlphabet$LanguagePairCount;->septetCounts:[I
-Lcom/android/internal/telephony/GsmAlphabet$LanguagePairCount;->unencodableCounts:[I
 Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;-><init>()V
-Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->codeUnitCount:I
-Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->codeUnitSize:I
-Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->codeUnitsRemaining:I
-Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->languageShiftTable:I
-Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->languageTable:I
-Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->msgCount:I
-Lcom/android/internal/telephony/GsmAlphabet;->charToGsm(C)I
-Lcom/android/internal/telephony/GsmAlphabet;->charToGsm(CZ)I
-Lcom/android/internal/telephony/GsmAlphabet;->countGsmSeptets(CZ)I
-Lcom/android/internal/telephony/GsmAlphabet;->findGsmSeptetLimitIndex(Ljava/lang/String;IIII)I
-Lcom/android/internal/telephony/GsmAlphabet;->gsm7BitPackedToString([BIIIII)Ljava/lang/String;
-Lcom/android/internal/telephony/GsmAlphabet;->gsm8BitUnpackedToString([BII)Ljava/lang/String;
-Lcom/android/internal/telephony/GsmAlphabet;->gsm8BitUnpackedToString([BIILjava/lang/String;)Ljava/lang/String;
-Lcom/android/internal/telephony/GsmAlphabet;->gsmToChar(I)C
-Lcom/android/internal/telephony/GsmAlphabet;->packSmsChar([BII)V
-Lcom/android/internal/telephony/GsmAlphabet;->sCharsToGsmTables:[Landroid/util/SparseIntArray;
-Lcom/android/internal/telephony/GsmAlphabet;->sCharsToShiftTables:[Landroid/util/SparseIntArray;
-Lcom/android/internal/telephony/GsmAlphabet;->sEnabledLockingShiftTables:[I
-Lcom/android/internal/telephony/GsmAlphabet;->sEnabledSingleShiftTables:[I
-Lcom/android/internal/telephony/GsmAlphabet;->sHighestEnabledSingleShiftCode:I
-Lcom/android/internal/telephony/GsmAlphabet;->sLanguageShiftTables:[Ljava/lang/String;
-Lcom/android/internal/telephony/GsmAlphabet;->sLanguageTables:[Ljava/lang/String;
-Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm7BitPacked(Ljava/lang/String;IZII)[B
-Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm7BitPackedWithHeader(Ljava/lang/String;[BII)[B
-Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm8BitPacked(Ljava/lang/String;)[B
 Lcom/android/internal/telephony/ICarrierConfigLoader;->getConfigForSubId(ILjava/lang/String;)Landroid/os/PersistableBundle;
 Lcom/android/internal/telephony/IMms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IMms;
 Lcom/android/internal/telephony/IPhoneStateListener$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneStateListener;
-Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
-Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
-Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
-Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
-Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
-Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
-Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
-Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
-Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
 Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;->getDeviceId(Ljava/lang/String;)Ljava/lang/String;
 Lcom/android/internal/telephony/IPhoneSubInfo$Stub;-><init>()V
@@ -2353,7 +2122,6 @@
 Lcom/android/internal/telephony/ITelephony;->toggleRadioOnOff()V
 Lcom/android/internal/telephony/ITelephony;->updateServiceLocation()V
 Lcom/android/internal/telephony/ITelephonyRegistry$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/telephony/ITelephonyRegistry$Stub;-><init>()V
 Lcom/android/internal/telephony/ITelephonyRegistry$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephonyRegistry;
 Lcom/android/internal/telephony/ITelephonyRegistry;->listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
 Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallForwardingChanged(Z)V
@@ -2367,76 +2135,13 @@
 Lcom/android/internal/telephony/IWapPushManager;->addPackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZ)Z
 Lcom/android/internal/telephony/IWapPushManager;->deletePackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
 Lcom/android/internal/telephony/IWapPushManager;->updatePackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZ)Z
-Lcom/android/internal/telephony/OperatorInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-Lcom/android/internal/telephony/OperatorInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/internal/telephony/OperatorInfo$State;)V
-Lcom/android/internal/telephony/OperatorInfo;->mOperatorAlphaLong:Ljava/lang/String;
-Lcom/android/internal/telephony/OperatorInfo;->mOperatorAlphaShort:Ljava/lang/String;
-Lcom/android/internal/telephony/OperatorInfo;->mOperatorNumeric:Ljava/lang/String;
-Lcom/android/internal/telephony/OperatorInfo;->mState:Lcom/android/internal/telephony/OperatorInfo$State;
-Lcom/android/internal/telephony/OperatorInfo;->rilStateToState(Ljava/lang/String;)Lcom/android/internal/telephony/OperatorInfo$State;
-Lcom/android/internal/telephony/SmsAddress;->origBytes:[B
-Lcom/android/internal/telephony/SmsConstants$MessageClass;->CLASS_0:Lcom/android/internal/telephony/SmsConstants$MessageClass;
-Lcom/android/internal/telephony/SmsConstants$MessageClass;->CLASS_1:Lcom/android/internal/telephony/SmsConstants$MessageClass;
-Lcom/android/internal/telephony/SmsConstants$MessageClass;->CLASS_2:Lcom/android/internal/telephony/SmsConstants$MessageClass;
-Lcom/android/internal/telephony/SmsConstants$MessageClass;->CLASS_3:Lcom/android/internal/telephony/SmsConstants$MessageClass;
-Lcom/android/internal/telephony/SmsConstants$MessageClass;->UNKNOWN:Lcom/android/internal/telephony/SmsConstants$MessageClass;
 Lcom/android/internal/telephony/SmsHeader$ConcatRef;-><init>()V
-Lcom/android/internal/telephony/SmsHeader$ConcatRef;->msgCount:I
-Lcom/android/internal/telephony/SmsHeader$ConcatRef;->refNumber:I
-Lcom/android/internal/telephony/SmsHeader$ConcatRef;->seqNumber:I
 Lcom/android/internal/telephony/SmsHeader$PortAddrs;-><init>()V
-Lcom/android/internal/telephony/SmsHeader$PortAddrs;->destPort:I
-Lcom/android/internal/telephony/SmsHeader$PortAddrs;->origPort:I
-Lcom/android/internal/telephony/SmsHeader;-><init>()V
-Lcom/android/internal/telephony/SmsHeader;->concatRef:Lcom/android/internal/telephony/SmsHeader$ConcatRef;
-Lcom/android/internal/telephony/SmsHeader;->fromByteArray([B)Lcom/android/internal/telephony/SmsHeader;
-Lcom/android/internal/telephony/SmsHeader;->languageShiftTable:I
-Lcom/android/internal/telephony/SmsHeader;->languageTable:I
-Lcom/android/internal/telephony/SmsHeader;->portAddrs:Lcom/android/internal/telephony/SmsHeader$PortAddrs;
-Lcom/android/internal/telephony/SmsHeader;->toByteArray(Lcom/android/internal/telephony/SmsHeader;)[B
-Lcom/android/internal/telephony/SmsMessageBase$SubmitPduBase;->encodedMessage:[B
-Lcom/android/internal/telephony/SmsMessageBase$SubmitPduBase;->encodedScAddress:[B
 Lcom/android/internal/telephony/SmsMessageBase;-><init>()V
-Lcom/android/internal/telephony/SmsMessageBase;->getDisplayMessageBody()Ljava/lang/String;
-Lcom/android/internal/telephony/SmsMessageBase;->getDisplayOriginatingAddress()Ljava/lang/String;
-Lcom/android/internal/telephony/SmsMessageBase;->getMessageBody()Ljava/lang/String;
-Lcom/android/internal/telephony/SmsMessageBase;->getOriginatingAddress()Ljava/lang/String;
-Lcom/android/internal/telephony/SmsMessageBase;->getProtocolIdentifier()I
-Lcom/android/internal/telephony/SmsMessageBase;->getPseudoSubject()Ljava/lang/String;
-Lcom/android/internal/telephony/SmsMessageBase;->getServiceCenterAddress()Ljava/lang/String;
-Lcom/android/internal/telephony/SmsMessageBase;->getStatus()I
-Lcom/android/internal/telephony/SmsMessageBase;->getTimestampMillis()J
-Lcom/android/internal/telephony/SmsMessageBase;->getUserData()[B
-Lcom/android/internal/telephony/SmsMessageBase;->getUserDataHeader()Lcom/android/internal/telephony/SmsHeader;
-Lcom/android/internal/telephony/SmsMessageBase;->isReplace()Z
-Lcom/android/internal/telephony/SmsMessageBase;->isReplyPathPresent()Z
-Lcom/android/internal/telephony/SmsMessageBase;->isStatusReportMessage()Z
-Lcom/android/internal/telephony/SmsMessageBase;->mIsMwi:Z
-Lcom/android/internal/telephony/SmsMessageBase;->mMessageBody:Ljava/lang/String;
-Lcom/android/internal/telephony/SmsMessageBase;->mMessageRef:I
-Lcom/android/internal/telephony/SmsMessageBase;->mMwiDontStore:Z
-Lcom/android/internal/telephony/SmsMessageBase;->mMwiSense:Z
-Lcom/android/internal/telephony/SmsMessageBase;->mOriginatingAddress:Lcom/android/internal/telephony/SmsAddress;
-Lcom/android/internal/telephony/SmsMessageBase;->mPdu:[B
-Lcom/android/internal/telephony/SmsMessageBase;->mScAddress:Ljava/lang/String;
-Lcom/android/internal/telephony/SmsMessageBase;->mUserDataHeader:Lcom/android/internal/telephony/SmsHeader;
-Lcom/android/internal/telephony/SmsRawData;-><init>([B)V
-Lcom/android/internal/telephony/SmsRawData;->CREATOR:Landroid/os/Parcelable$Creator;
-Lcom/android/internal/telephony/SmsRawData;->getBytes()[B
 Lcom/android/internal/textservice/ITextServicesManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Lcom/android/internal/util/HexDump;->toHexString([BZ)Ljava/lang/String;
 Lcom/android/internal/view/BaseIWindow;-><init>()V
-Lcom/android/internal/view/IInputMethod$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethod;
-Lcom/android/internal/view/IInputMethod;->bindInput(Landroid/view/inputmethod/InputBinding;)V
-Lcom/android/internal/view/IInputMethod;->hideSoftInput(ILandroid/os/ResultReceiver;)V
-Lcom/android/internal/view/IInputMethod;->setSessionEnabled(Lcom/android/internal/view/IInputMethodSession;Z)V
-Lcom/android/internal/view/IInputMethod;->showSoftInput(ILandroid/os/ResultReceiver;)V
-Lcom/android/internal/view/IInputMethod;->unbindInput()V
-Lcom/android/internal/view/IInputMethodClient;->onBindMethod(Lcom/android/internal/view/InputBindResult;)V
-Lcom/android/internal/view/IInputMethodClient;->setUsingInputMethod(Z)V
 Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;->getEnabledInputMethodList()Ljava/util/List;
-Lcom/android/internal/view/IInputMethodManager$Stub;-><init>()V
 Lcom/android/internal/view/IInputMethodManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodManager;
 Lcom/android/internal/view/IInputMethodSession$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodSession;
 Lcom/android/internal/widget/ILockSettings$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/widget/ILockSettings;
diff --git a/config/hiddenapi-p-light-greylist.txt b/config/hiddenapi-p-light-greylist.txt
deleted file mode 100644
index e26a4c7..0000000
--- a/config/hiddenapi-p-light-greylist.txt
+++ /dev/null
@@ -1,5992 +0,0 @@
-Landroid/R$styleable;->ActionBar:[I
-Landroid/R$styleable;->ActionBar_background:I
-Landroid/R$styleable;->ActionBar_backgroundSplit:I
-Landroid/R$styleable;->ActionBar_backgroundStacked:I
-Landroid/R$styleable;->ActionBar_divider:I
-Landroid/R$styleable;->ActionBar_itemPadding:I
-Landroid/R$styleable;->CalendarView:[I
-Landroid/R$styleable;->CalendarView_dateTextAppearance:I
-Landroid/R$styleable;->CalendarView_firstDayOfWeek:I
-Landroid/R$styleable;->CalendarView_focusedMonthDateColor:I
-Landroid/R$styleable;->CalendarView_selectedDateVerticalBar:I
-Landroid/R$styleable;->CalendarView_selectedWeekBackgroundColor:I
-Landroid/R$styleable;->CalendarView_showWeekNumber:I
-Landroid/R$styleable;->CalendarView_shownWeekCount:I
-Landroid/R$styleable;->CalendarView_unfocusedMonthDateColor:I
-Landroid/R$styleable;->CalendarView_weekDayTextAppearance:I
-Landroid/R$styleable;->CalendarView_weekNumberColor:I
-Landroid/R$styleable;->CalendarView_weekSeparatorLineColor:I
-Landroid/R$styleable;->CheckBoxPreference:[I
-Landroid/R$styleable;->CheckedTextView:[I
-Landroid/R$styleable;->CheckedTextView_checkMark:I
-Landroid/R$styleable;->CompoundButton:[I
-Landroid/R$styleable;->CompoundButton_button:I
-Landroid/R$styleable;->DrawableStates:[I
-Landroid/R$styleable;->ImageView:[I
-Landroid/R$styleable;->ImageView_adjustViewBounds:I
-Landroid/R$styleable;->ImageView_baselineAlignBottom:I
-Landroid/R$styleable;->ImageView_cropToPadding:I
-Landroid/R$styleable;->ImageView_maxHeight:I
-Landroid/R$styleable;->ImageView_maxWidth:I
-Landroid/R$styleable;->ImageView_scaleType:I
-Landroid/R$styleable;->ImageView_src:I
-Landroid/R$styleable;->ImageView_tint:I
-Landroid/R$styleable;->LinearLayout:[I
-Landroid/R$styleable;->LinearLayout_divider:I
-Landroid/R$styleable;->LinearLayout_dividerPadding:I
-Landroid/R$styleable;->LinearLayout_showDividers:I
-Landroid/R$styleable;->ListView:[I
-Landroid/R$styleable;->ListView_divider:I
-Landroid/R$styleable;->ListView_dividerHeight:I
-Landroid/R$styleable;->ProgressBar:[I
-Landroid/R$styleable;->ProgressBar_indeterminateDrawable:I
-Landroid/R$styleable;->ProgressBar_indeterminateDuration:I
-Landroid/R$styleable;->ProgressBar_maxHeight:I
-Landroid/R$styleable;->ProgressBar_maxWidth:I
-Landroid/R$styleable;->ProgressBar_minHeight:I
-Landroid/R$styleable;->ProgressBar_minWidth:I
-Landroid/R$styleable;->ProgressBar_progressDrawable:I
-Landroid/R$styleable;->SeekBar:[I
-Landroid/R$styleable;->SeekBar_thumb:I
-Landroid/R$styleable;->SeekBar_thumbOffset:I
-Landroid/R$styleable;->Switch:[I
-Landroid/R$styleable;->Switch_showText:I
-Landroid/R$styleable;->Switch_splitTrack:I
-Landroid/R$styleable;->Switch_switchMinWidth:I
-Landroid/R$styleable;->Switch_switchPadding:I
-Landroid/R$styleable;->Switch_switchTextAppearance:I
-Landroid/R$styleable;->Switch_textOff:I
-Landroid/R$styleable;->Switch_textOn:I
-Landroid/R$styleable;->Switch_thumb:I
-Landroid/R$styleable;->Switch_thumbTextPadding:I
-Landroid/R$styleable;->Switch_track:I
-Landroid/R$styleable;->TextAppearance:[I
-Landroid/R$styleable;->TextAppearance_textAllCaps:I
-Landroid/R$styleable;->TextAppearance_textColor:I
-Landroid/R$styleable;->TextAppearance_textColorHighlight:I
-Landroid/R$styleable;->TextAppearance_textColorHint:I
-Landroid/R$styleable;->TextAppearance_textColorLink:I
-Landroid/R$styleable;->TextAppearance_textSize:I
-Landroid/R$styleable;->TextAppearance_textStyle:I
-Landroid/R$styleable;->TextAppearance_typeface:I
-Landroid/R$styleable;->TextView:[I
-Landroid/R$styleable;->TextView_autoLink:I
-Landroid/R$styleable;->TextView_autoText:I
-Landroid/R$styleable;->TextView_bufferType:I
-Landroid/R$styleable;->TextView_capitalize:I
-Landroid/R$styleable;->TextView_cursorVisible:I
-Landroid/R$styleable;->TextView_digits:I
-Landroid/R$styleable;->TextView_drawableBottom:I
-Landroid/R$styleable;->TextView_drawableEnd:I
-Landroid/R$styleable;->TextView_drawableLeft:I
-Landroid/R$styleable;->TextView_drawablePadding:I
-Landroid/R$styleable;->TextView_drawableRight:I
-Landroid/R$styleable;->TextView_drawableStart:I
-Landroid/R$styleable;->TextView_drawableTop:I
-Landroid/R$styleable;->TextView_editable:I
-Landroid/R$styleable;->TextView_ellipsize:I
-Landroid/R$styleable;->TextView_ems:I
-Landroid/R$styleable;->TextView_enabled:I
-Landroid/R$styleable;->TextView_freezesText:I
-Landroid/R$styleable;->TextView_gravity:I
-Landroid/R$styleable;->TextView_height:I
-Landroid/R$styleable;->TextView_hint:I
-Landroid/R$styleable;->TextView_imeActionId:I
-Landroid/R$styleable;->TextView_imeActionLabel:I
-Landroid/R$styleable;->TextView_imeOptions:I
-Landroid/R$styleable;->TextView_includeFontPadding:I
-Landroid/R$styleable;->TextView_inputMethod:I
-Landroid/R$styleable;->TextView_inputType:I
-Landroid/R$styleable;->TextView_lineSpacingExtra:I
-Landroid/R$styleable;->TextView_lineSpacingMultiplier:I
-Landroid/R$styleable;->TextView_lines:I
-Landroid/R$styleable;->TextView_linksClickable:I
-Landroid/R$styleable;->TextView_marqueeRepeatLimit:I
-Landroid/R$styleable;->TextView_maxEms:I
-Landroid/R$styleable;->TextView_maxHeight:I
-Landroid/R$styleable;->TextView_maxLength:I
-Landroid/R$styleable;->TextView_maxLines:I
-Landroid/R$styleable;->TextView_maxWidth:I
-Landroid/R$styleable;->TextView_minEms:I
-Landroid/R$styleable;->TextView_minHeight:I
-Landroid/R$styleable;->TextView_minLines:I
-Landroid/R$styleable;->TextView_minWidth:I
-Landroid/R$styleable;->TextView_numeric:I
-Landroid/R$styleable;->TextView_password:I
-Landroid/R$styleable;->TextView_phoneNumber:I
-Landroid/R$styleable;->TextView_privateImeOptions:I
-Landroid/R$styleable;->TextView_scrollHorizontally:I
-Landroid/R$styleable;->TextView_selectAllOnFocus:I
-Landroid/R$styleable;->TextView_shadowColor:I
-Landroid/R$styleable;->TextView_shadowDx:I
-Landroid/R$styleable;->TextView_shadowDy:I
-Landroid/R$styleable;->TextView_shadowRadius:I
-Landroid/R$styleable;->TextView_singleLine:I
-Landroid/R$styleable;->TextView_text:I
-Landroid/R$styleable;->TextView_textAllCaps:I
-Landroid/R$styleable;->TextView_textAppearance:I
-Landroid/R$styleable;->TextView_textColor:I
-Landroid/R$styleable;->TextView_textColorHighlight:I
-Landroid/R$styleable;->TextView_textColorHint:I
-Landroid/R$styleable;->TextView_textColorLink:I
-Landroid/R$styleable;->TextView_textCursorDrawable:I
-Landroid/R$styleable;->TextView_textIsSelectable:I
-Landroid/R$styleable;->TextView_textScaleX:I
-Landroid/R$styleable;->TextView_textSelectHandle:I
-Landroid/R$styleable;->TextView_textSelectHandleLeft:I
-Landroid/R$styleable;->TextView_textSelectHandleRight:I
-Landroid/R$styleable;->TextView_textSize:I
-Landroid/R$styleable;->TextView_textStyle:I
-Landroid/R$styleable;->TextView_typeface:I
-Landroid/R$styleable;->TextView_width:I
-Landroid/R$styleable;->View:[I
-Landroid/R$styleable;->ViewDrawableStates:[I
-Landroid/R$styleable;->ViewGroup_Layout:[I
-Landroid/R$styleable;->ViewGroup_MarginLayout:[I
-Landroid/R$styleable;->View_background:I
-Landroid/R$styleable;->View_clickable:I
-Landroid/R$styleable;->View_contentDescription:I
-Landroid/R$styleable;->View_drawingCacheQuality:I
-Landroid/R$styleable;->View_duplicateParentState:I
-Landroid/R$styleable;->View_fadingEdge:I
-Landroid/R$styleable;->View_filterTouchesWhenObscured:I
-Landroid/R$styleable;->View_fitsSystemWindows:I
-Landroid/R$styleable;->View_focusable:I
-Landroid/R$styleable;->View_focusableInTouchMode:I
-Landroid/R$styleable;->View_hapticFeedbackEnabled:I
-Landroid/R$styleable;->View_id:I
-Landroid/R$styleable;->View_isScrollContainer:I
-Landroid/R$styleable;->View_keepScreenOn:I
-Landroid/R$styleable;->View_longClickable:I
-Landroid/R$styleable;->View_minHeight:I
-Landroid/R$styleable;->View_minWidth:I
-Landroid/R$styleable;->View_nextFocusDown:I
-Landroid/R$styleable;->View_nextFocusLeft:I
-Landroid/R$styleable;->View_nextFocusRight:I
-Landroid/R$styleable;->View_nextFocusUp:I
-Landroid/R$styleable;->View_onClick:I
-Landroid/R$styleable;->View_overScrollMode:I
-Landroid/R$styleable;->View_padding:I
-Landroid/R$styleable;->View_paddingBottom:I
-Landroid/R$styleable;->View_paddingEnd:I
-Landroid/R$styleable;->View_paddingLeft:I
-Landroid/R$styleable;->View_paddingRight:I
-Landroid/R$styleable;->View_paddingStart:I
-Landroid/R$styleable;->View_paddingTop:I
-Landroid/R$styleable;->View_saveEnabled:I
-Landroid/R$styleable;->View_scrollX:I
-Landroid/R$styleable;->View_scrollY:I
-Landroid/R$styleable;->View_scrollbarDefaultDelayBeforeFade:I
-Landroid/R$styleable;->View_scrollbarFadeDuration:I
-Landroid/R$styleable;->View_scrollbarSize:I
-Landroid/R$styleable;->View_scrollbarStyle:I
-Landroid/R$styleable;->View_scrollbarThumbHorizontal:I
-Landroid/R$styleable;->View_scrollbarThumbVertical:I
-Landroid/R$styleable;->View_scrollbarTrackHorizontal:I
-Landroid/R$styleable;->View_scrollbarTrackVertical:I
-Landroid/R$styleable;->View_scrollbars:I
-Landroid/R$styleable;->View_soundEffectsEnabled:I
-Landroid/R$styleable;->View_tag:I
-Landroid/R$styleable;->View_visibility:I
-Landroid/R$styleable;->Window:[I
-Landroid/R$styleable;->Window_windowBackground:I
-Landroid/R$styleable;->Window_windowFrame:I
-Landroid/accounts/AccountManager;-><init>(Landroid/content/Context;Landroid/accounts/IAccountManager;Landroid/os/Handler;)V
-Landroid/accounts/AccountManager;->mContext:Landroid/content/Context;
-Landroid/accounts/IAccountAuthenticator$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/accounts/IAccountAuthenticator$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/accounts/IAccountAuthenticator$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountAuthenticator;
-Landroid/accounts/IAccountAuthenticator;->addAccount(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/os/Bundle;)V
-Landroid/accounts/IAccountAuthenticator;->confirmCredentials(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Landroid/os/Bundle;)V
-Landroid/accounts/IAccountAuthenticator;->editProperties(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;)V
-Landroid/accounts/IAccountAuthenticator;->getAccountRemovalAllowed(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;)V
-Landroid/accounts/IAccountAuthenticator;->getAuthToken(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;)V
-Landroid/accounts/IAccountAuthenticator;->getAuthTokenLabel(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;)V
-Landroid/accounts/IAccountAuthenticator;->hasFeatures(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;[Ljava/lang/String;)V
-Landroid/accounts/IAccountAuthenticator;->updateCredentials(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;)V
-Landroid/accounts/IAccountAuthenticatorResponse$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/accounts/IAccountAuthenticatorResponse$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/accounts/IAccountAuthenticatorResponse$Stub;-><init>()V
-Landroid/accounts/IAccountAuthenticatorResponse$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountAuthenticatorResponse;
-Landroid/accounts/IAccountManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/accounts/IAccountManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountManager;
-Landroid/accounts/IAccountManagerResponse$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/accounts/IAccountManagerResponse$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/accounts/IAccountManagerResponse$Stub;-><init>()V
-Landroid/accounts/IAccountManagerResponse$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountManagerResponse;
-Landroid/accounts/IAccountManagerResponse;->onError(ILjava/lang/String;)V
-Landroid/accounts/IAccountManagerResponse;->onResult(Landroid/os/Bundle;)V
-Landroid/animation/LayoutTransition;->cancel()V
-Landroid/animation/LayoutTransition;->cancel(I)V
-Landroid/animation/ValueAnimator;->animateValue(F)V
-Landroid/animation/ValueAnimator;->sDurationScale:F
-Landroid/app/ActionBar;->setShowHideAnimationEnabled(Z)V
-Landroid/app/Activity;->enterPictureInPictureMode(Landroid/app/PictureInPictureArgs;)Z
-Landroid/app/Activity;->getActivityOptions()Landroid/app/ActivityOptions;
-Landroid/app/Activity;->getActivityToken()Landroid/os/IBinder;
-Landroid/app/Activity;->mActivityInfo:Landroid/content/pm/ActivityInfo;
-Landroid/app/Activity;->mApplication:Landroid/app/Application;
-Landroid/app/Activity;->mComponent:Landroid/content/ComponentName;
-Landroid/app/Activity;->mFinished:Z
-Landroid/app/Activity;->mFragments:Landroid/app/FragmentController;
-Landroid/app/Activity;->mHandler:Landroid/os/Handler;
-Landroid/app/Activity;->mInstrumentation:Landroid/app/Instrumentation;
-Landroid/app/Activity;->mMainThread:Landroid/app/ActivityThread;
-Landroid/app/Activity;->mReferrer:Ljava/lang/String;
-Landroid/app/Activity;->mResultCode:I
-Landroid/app/Activity;->mResultData:Landroid/content/Intent;
-Landroid/app/Activity;->mResumed:Z
-Landroid/app/Activity;->mToken:Landroid/os/IBinder;
-Landroid/app/Activity;->mWindow:Landroid/view/Window;
-Landroid/app/Activity;->mWindowManager:Landroid/view/WindowManager;
-Landroid/app/Activity;->managedQuery(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
-Landroid/app/Activity;->registerRemoteAnimations(Landroid/view/RemoteAnimationDefinition;)V
-Landroid/app/Activity;->setDisablePreviewScreenshots(Z)V
-Landroid/app/Activity;->setPersistent(Z)V
-Landroid/app/Activity;->setPictureInPictureArgs(Landroid/app/PictureInPictureArgs;)V
-Landroid/app/ActivityGroup;->mLocalActivityManager:Landroid/app/LocalActivityManager;
-Landroid/app/ActivityManager$RecentTaskInfo;->configuration:Landroid/content/res/Configuration;
-Landroid/app/ActivityManager$RecentTaskInfo;->firstActiveTime:J
-Landroid/app/ActivityManager$RecentTaskInfo;->lastActiveTime:J
-Landroid/app/ActivityManager$RecentTaskInfo;->resizeMode:I
-Landroid/app/ActivityManager$RecentTaskInfo;->supportsSplitScreenMultiWindow:Z
-Landroid/app/ActivityManager$RecentTaskInfo;->userId:I
-Landroid/app/ActivityManager$RunningAppProcessInfo;->flags:I
-Landroid/app/ActivityManager$RunningAppProcessInfo;->processState:I
-Landroid/app/ActivityManager$TaskDescription;->getBackgroundColor()I
-Landroid/app/ActivityManager$TaskDescription;->getInMemoryIcon()Landroid/graphics/Bitmap;
-Landroid/app/ActivityManager$TaskDescription;->loadTaskDescriptionIcon(Ljava/lang/String;I)Landroid/graphics/Bitmap;
-Landroid/app/ActivityManager$TaskSnapshot;->getContentInsets()Landroid/graphics/Rect;
-Landroid/app/ActivityManager$TaskSnapshot;->getOrientation()I
-Landroid/app/ActivityManager$TaskSnapshot;->getScale()F
-Landroid/app/ActivityManager$TaskSnapshot;->getSnapshot()Landroid/graphics/GraphicBuffer;
-Landroid/app/ActivityManager$TaskSnapshot;->isRealSnapshot()Z
-Landroid/app/ActivityManager$TaskSnapshot;->isReducedResolution()Z
-Landroid/app/ActivityManager;->IActivityManagerSingleton:Landroid/util/Singleton;
-Landroid/app/ActivityManager;->PROCESS_STATE_IMPORTANT_BACKGROUND:I
-Landroid/app/ActivityManager;->PROCESS_STATE_TOP:I
-Landroid/app/ActivityManager;->clearApplicationUserData(Ljava/lang/String;Landroid/content/pm/IPackageDataObserver;)Z
-Landroid/app/ActivityManager;->getMaxNumPictureInPictureActions()I
-Landroid/app/ActivityManager;->getMaxRecentTasksStatic()I
-Landroid/app/ActivityManager;->getService()Landroid/app/IActivityManager;
-Landroid/app/ActivityManager;->isHighEndGfx()Z
-Landroid/app/ActivityManager;->isLowRamDeviceStatic()Z
-Landroid/app/ActivityManager;->isUserRunning(I)Z
-Landroid/app/ActivityManager;->mContext:Landroid/content/Context;
-Landroid/app/ActivityManager;->setPersistentVrThread(I)V
-Landroid/app/ActivityManagerNative;->asInterface(Landroid/os/IBinder;)Landroid/app/IActivityManager;
-Landroid/app/ActivityManagerNative;->broadcastStickyIntent(Landroid/content/Intent;Ljava/lang/String;I)V
-Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
-Landroid/app/ActivityOptions;->makeMultiThumbFutureAspectScaleAnimation(Landroid/content/Context;Landroid/os/Handler;Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/app/ActivityOptions$OnAnimationStartedListener;Z)Landroid/app/ActivityOptions;
-Landroid/app/ActivityOptions;->makeRemoteAnimation(Landroid/view/RemoteAnimationAdapter;)Landroid/app/ActivityOptions;
-Landroid/app/ActivityOptions;->setSplitScreenCreateMode(I)V
-Landroid/app/ActivityThread$ActivityClientRecord;->activity:Landroid/app/Activity;
-Landroid/app/ActivityThread$ActivityClientRecord;->activityInfo:Landroid/content/pm/ActivityInfo;
-Landroid/app/ActivityThread$ActivityClientRecord;->compatInfo:Landroid/content/res/CompatibilityInfo;
-Landroid/app/ActivityThread$ActivityClientRecord;->intent:Landroid/content/Intent;
-Landroid/app/ActivityThread$ActivityClientRecord;->mPreserveWindow:Z
-Landroid/app/ActivityThread$ActivityClientRecord;->packageInfo:Landroid/app/LoadedApk;
-Landroid/app/ActivityThread$ActivityClientRecord;->paused:Z
-Landroid/app/ActivityThread$ActivityClientRecord;->stopped:Z
-Landroid/app/ActivityThread$ActivityClientRecord;->token:Landroid/os/IBinder;
-Landroid/app/ActivityThread$AppBindData;->appInfo:Landroid/content/pm/ApplicationInfo;
-Landroid/app/ActivityThread$AppBindData;->info:Landroid/app/LoadedApk;
-Landroid/app/ActivityThread$AppBindData;->instrumentationArgs:Landroid/os/Bundle;
-Landroid/app/ActivityThread$AppBindData;->persistent:Z
-Landroid/app/ActivityThread$AppBindData;->processName:Ljava/lang/String;
-Landroid/app/ActivityThread$AppBindData;->providers:Ljava/util/List;
-Landroid/app/ActivityThread$AppBindData;->restrictedBackupMode:Z
-Landroid/app/ActivityThread$BindServiceData;->intent:Landroid/content/Intent;
-Landroid/app/ActivityThread$BindServiceData;->token:Landroid/os/IBinder;
-Landroid/app/ActivityThread$CreateServiceData;-><init>()V
-Landroid/app/ActivityThread$CreateServiceData;->compatInfo:Landroid/content/res/CompatibilityInfo;
-Landroid/app/ActivityThread$CreateServiceData;->info:Landroid/content/pm/ServiceInfo;
-Landroid/app/ActivityThread$CreateServiceData;->intent:Landroid/content/Intent;
-Landroid/app/ActivityThread$CreateServiceData;->token:Landroid/os/IBinder;
-Landroid/app/ActivityThread$H;->BIND_SERVICE:I
-Landroid/app/ActivityThread$H;->CREATE_SERVICE:I
-Landroid/app/ActivityThread$H;->DUMP_PROVIDER:I
-Landroid/app/ActivityThread$H;->ENTER_ANIMATION_COMPLETE:I
-Landroid/app/ActivityThread$H;->EXIT_APPLICATION:I
-Landroid/app/ActivityThread$H;->GC_WHEN_IDLE:I
-Landroid/app/ActivityThread$H;->INSTALL_PROVIDER:I
-Landroid/app/ActivityThread$H;->RECEIVER:I
-Landroid/app/ActivityThread$H;->REMOVE_PROVIDER:I
-Landroid/app/ActivityThread$H;->SCHEDULE_CRASH:I
-Landroid/app/ActivityThread$H;->SERVICE_ARGS:I
-Landroid/app/ActivityThread$H;->STOP_SERVICE:I
-Landroid/app/ActivityThread$H;->UNBIND_SERVICE:I
-Landroid/app/ActivityThread$ProviderClientRecord;->mHolder:Landroid/app/ContentProviderHolder;
-Landroid/app/ActivityThread$ProviderClientRecord;->mLocalProvider:Landroid/content/ContentProvider;
-Landroid/app/ActivityThread$ProviderClientRecord;->mProvider:Landroid/content/IContentProvider;
-Landroid/app/ActivityThread$ReceiverData;->compatInfo:Landroid/content/res/CompatibilityInfo;
-Landroid/app/ActivityThread$ReceiverData;->info:Landroid/content/pm/ActivityInfo;
-Landroid/app/ActivityThread$ReceiverData;->intent:Landroid/content/Intent;
-Landroid/app/ActivityThread$ServiceArgsData;->args:Landroid/content/Intent;
-Landroid/app/ActivityThread$ServiceArgsData;->token:Landroid/os/IBinder;
-Landroid/app/ActivityThread;->currentActivityThread()Landroid/app/ActivityThread;
-Landroid/app/ActivityThread;->currentApplication()Landroid/app/Application;
-Landroid/app/ActivityThread;->currentPackageName()Ljava/lang/String;
-Landroid/app/ActivityThread;->currentProcessName()Ljava/lang/String;
-Landroid/app/ActivityThread;->getActivity(Landroid/os/IBinder;)Landroid/app/Activity;
-Landroid/app/ActivityThread;->getApplication()Landroid/app/Application;
-Landroid/app/ActivityThread;->getApplicationThread()Landroid/app/ActivityThread$ApplicationThread;
-Landroid/app/ActivityThread;->getHandler()Landroid/os/Handler;
-Landroid/app/ActivityThread;->getInstrumentation()Landroid/app/Instrumentation;
-Landroid/app/ActivityThread;->getPackageInfo(Landroid/content/pm/ApplicationInfo;Landroid/content/res/CompatibilityInfo;I)Landroid/app/LoadedApk;
-Landroid/app/ActivityThread;->getPackageInfoNoCheck(Landroid/content/pm/ApplicationInfo;Landroid/content/res/CompatibilityInfo;)Landroid/app/LoadedApk;
-Landroid/app/ActivityThread;->getPackageManager()Landroid/content/pm/IPackageManager;
-Landroid/app/ActivityThread;->getProcessName()Ljava/lang/String;
-Landroid/app/ActivityThread;->getSystemContext()Landroid/app/ContextImpl;
-Landroid/app/ActivityThread;->handleBindApplication(Landroid/app/ActivityThread$AppBindData;)V
-Landroid/app/ActivityThread;->installContentProviders(Landroid/content/Context;Ljava/util/List;)V
-Landroid/app/ActivityThread;->installProvider(Landroid/content/Context;Landroid/app/ContentProviderHolder;Landroid/content/pm/ProviderInfo;ZZZ)Landroid/app/ContentProviderHolder;
-Landroid/app/ActivityThread;->mActivities:Landroid/util/ArrayMap;
-Landroid/app/ActivityThread;->mAllApplications:Ljava/util/ArrayList;
-Landroid/app/ActivityThread;->mBoundApplication:Landroid/app/ActivityThread$AppBindData;
-Landroid/app/ActivityThread;->mConfiguration:Landroid/content/res/Configuration;
-Landroid/app/ActivityThread;->mCurDefaultDisplayDpi:I
-Landroid/app/ActivityThread;->mDensityCompatMode:Z
-Landroid/app/ActivityThread;->mH:Landroid/app/ActivityThread$H;
-Landroid/app/ActivityThread;->mInitialApplication:Landroid/app/Application;
-Landroid/app/ActivityThread;->mInstrumentation:Landroid/app/Instrumentation;
-Landroid/app/ActivityThread;->mLocalProviders:Landroid/util/ArrayMap;
-Landroid/app/ActivityThread;->mLocalProvidersByName:Landroid/util/ArrayMap;
-Landroid/app/ActivityThread;->mNumVisibleActivities:I
-Landroid/app/ActivityThread;->mPackages:Landroid/util/ArrayMap;
-Landroid/app/ActivityThread;->mPendingConfiguration:Landroid/content/res/Configuration;
-Landroid/app/ActivityThread;->mProviderMap:Landroid/util/ArrayMap;
-Landroid/app/ActivityThread;->mResourcePackages:Landroid/util/ArrayMap;
-Landroid/app/ActivityThread;->mResourcesManager:Landroid/app/ResourcesManager;
-Landroid/app/ActivityThread;->mServices:Landroid/util/ArrayMap;
-Landroid/app/ActivityThread;->performNewIntents(Landroid/os/IBinder;Ljava/util/List;Z)V
-Landroid/app/ActivityThread;->performStopActivity(Landroid/os/IBinder;ZLjava/lang/String;)V
-Landroid/app/ActivityThread;->sCurrentActivityThread:Landroid/app/ActivityThread;
-Landroid/app/ActivityThread;->sPackageManager:Landroid/content/pm/IPackageManager;
-Landroid/app/ActivityThread;->sendActivityResult(Landroid/os/IBinder;Ljava/lang/String;IILandroid/content/Intent;)V
-Landroid/app/ActivityThread;->startActivityNow(Landroid/app/Activity;Ljava/lang/String;Landroid/content/Intent;Landroid/content/pm/ActivityInfo;Landroid/os/IBinder;Landroid/os/Bundle;Landroid/app/Activity$NonConfigurationInstances;)Landroid/app/Activity;
-Landroid/app/ActivityView;-><init>(Landroid/content/Context;)V
-Landroid/app/ActivityView;->release()V
-Landroid/app/ActivityView;->startActivity(Landroid/app/PendingIntent;)V
-Landroid/app/ActivityView;->startActivity(Landroid/content/Intent;)V
-Landroid/app/AlarmManager;->FLAG_ALLOW_WHILE_IDLE_UNRESTRICTED:I
-Landroid/app/AlarmManager;->FLAG_IDLE_UNTIL:I
-Landroid/app/AlarmManager;->FLAG_STANDALONE:I
-Landroid/app/AlarmManager;->FLAG_WAKE_FROM_IDLE:I
-Landroid/app/AlarmManager;->WINDOW_EXACT:J
-Landroid/app/AlarmManager;->WINDOW_HEURISTIC:J
-Landroid/app/AlarmManager;->mService:Landroid/app/IAlarmManager;
-Landroid/app/AlertDialog$Builder;->P:Lcom/android/internal/app/AlertController$AlertParams;
-Landroid/app/AlertDialog$Builder;->setRecycleOnMeasureEnabled(Z)Landroid/app/AlertDialog$Builder;
-Landroid/app/AlertDialog$Builder;->setView(Landroid/view/View;IIII)Landroid/app/AlertDialog$Builder;
-Landroid/app/AlertDialog;->mAlert:Lcom/android/internal/app/AlertController;
-Landroid/app/AppGlobals;->getInitialApplication()Landroid/app/Application;
-Landroid/app/AppGlobals;->getInitialPackage()Ljava/lang/String;
-Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
-Landroid/app/AppOpsManager$OpEntry;->getDuration()I
-Landroid/app/AppOpsManager$OpEntry;->getOp()I
-Landroid/app/AppOpsManager$OpEntry;->getRejectTime()J
-Landroid/app/AppOpsManager$OpEntry;->getTime()J
-Landroid/app/AppOpsManager;->OP_AUDIO_NOTIFICATION_VOLUME:I
-Landroid/app/AppOpsManager;->OP_COARSE_LOCATION:I
-Landroid/app/AppOpsManager;->OP_FINE_LOCATION:I
-Landroid/app/AppOpsManager;->OP_GET_USAGE_STATS:I
-Landroid/app/AppOpsManager;->OP_POST_NOTIFICATION:I
-Landroid/app/AppOpsManager;->OP_PROJECT_MEDIA:I
-Landroid/app/AppOpsManager;->OP_READ_CONTACTS:I
-Landroid/app/AppOpsManager;->OP_READ_PHONE_STATE:I
-Landroid/app/AppOpsManager;->OP_READ_SMS:I
-Landroid/app/AppOpsManager;->OP_RUN_IN_BACKGROUND:I
-Landroid/app/AppOpsManager;->OP_VIBRATE:I
-Landroid/app/AppOpsManager;->OP_WIFI_SCAN:I
-Landroid/app/AppOpsManager;->OP_WRITE_CONTACTS:I
-Landroid/app/AppOpsManager;->OP_WRITE_SMS:I
-Landroid/app/AppOpsManager;->checkOp(IILjava/lang/String;)I
-Landroid/app/AppOpsManager;->checkOpNoThrow(IILjava/lang/String;)I
-Landroid/app/AppOpsManager;->getOpsForPackage(ILjava/lang/String;[I)Ljava/util/List;
-Landroid/app/AppOpsManager;->getPackagesForOps([I)Ljava/util/List;
-Landroid/app/AppOpsManager;->getToken(Lcom/android/internal/app/IAppOpsService;)Landroid/os/IBinder;
-Landroid/app/AppOpsManager;->mService:Lcom/android/internal/app/IAppOpsService;
-Landroid/app/AppOpsManager;->noteOp(I)I
-Landroid/app/AppOpsManager;->noteOp(IILjava/lang/String;)I
-Landroid/app/AppOpsManager;->permissionToOpCode(Ljava/lang/String;)I
-Landroid/app/AppOpsManager;->sOpPerms:[Ljava/lang/String;
-Landroid/app/AppOpsManager;->setRestriction(III[Ljava/lang/String;)V
-Landroid/app/AppOpsManager;->strOpToOp(Ljava/lang/String;)I
-Landroid/app/Application;->attach(Landroid/content/Context;)V
-Landroid/app/Application;->collectActivityLifecycleCallbacks()[Ljava/lang/Object;
-Landroid/app/Application;->dispatchActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
-Landroid/app/Application;->dispatchActivityDestroyed(Landroid/app/Activity;)V
-Landroid/app/Application;->dispatchActivityPaused(Landroid/app/Activity;)V
-Landroid/app/Application;->dispatchActivityResumed(Landroid/app/Activity;)V
-Landroid/app/Application;->dispatchActivitySaveInstanceState(Landroid/app/Activity;Landroid/os/Bundle;)V
-Landroid/app/Application;->dispatchActivityStarted(Landroid/app/Activity;)V
-Landroid/app/Application;->dispatchActivityStopped(Landroid/app/Activity;)V
-Landroid/app/Application;->mComponentCallbacks:Ljava/util/ArrayList;
-Landroid/app/Application;->mLoadedApk:Landroid/app/LoadedApk;
-Landroid/app/ApplicationLoaders;->getDefault()Landroid/app/ApplicationLoaders;
-Landroid/app/ApplicationLoaders;->mLoaders:Landroid/util/ArrayMap;
-Landroid/app/ApplicationPackageManager;-><init>(Landroid/app/ContextImpl;Landroid/content/pm/IPackageManager;)V
-Landroid/app/ApplicationPackageManager;->configurationChanged()V
-Landroid/app/ApplicationPackageManager;->deletePackage(Ljava/lang/String;Landroid/content/pm/IPackageDeleteObserver;I)V
-Landroid/app/ApplicationPackageManager;->getPackageCurrentVolume(Landroid/content/pm/ApplicationInfo;)Landroid/os/storage/VolumeInfo;
-Landroid/app/ApplicationPackageManager;->getPackageSizeInfoAsUser(Ljava/lang/String;ILandroid/content/pm/IPackageStatsObserver;)V
-Landroid/app/ApplicationPackageManager;->mPM:Landroid/content/pm/IPackageManager;
-Landroid/app/ApplicationPackageManager;->setInstantAppCookie([B)Z
-Landroid/app/ApplicationPackageManager;->shouldShowRequestPermissionRationale(Ljava/lang/String;)Z
-Landroid/app/ContentProviderHolder;-><init>(Landroid/content/pm/ProviderInfo;)V
-Landroid/app/ContentProviderHolder;->info:Landroid/content/pm/ProviderInfo;
-Landroid/app/ContentProviderHolder;->provider:Landroid/content/IContentProvider;
-Landroid/app/ContextImpl;->createActivityContext(Landroid/app/ActivityThread;Landroid/app/LoadedApk;Landroid/content/pm/ActivityInfo;Landroid/os/IBinder;ILandroid/content/res/Configuration;)Landroid/app/ContextImpl;
-Landroid/app/ContextImpl;->getActivityToken()Landroid/os/IBinder;
-Landroid/app/ContextImpl;->getDisplay()Landroid/view/Display;
-Landroid/app/ContextImpl;->getPreferencesDir()Ljava/io/File;
-Landroid/app/ContextImpl;->getReceiverRestrictedContext()Landroid/content/Context;
-Landroid/app/ContextImpl;->getSharedPreferences(Ljava/io/File;I)Landroid/content/SharedPreferences;
-Landroid/app/ContextImpl;->getSharedPreferencesPath(Ljava/lang/String;)Ljava/io/File;
-Landroid/app/ContextImpl;->mBasePackageName:Ljava/lang/String;
-Landroid/app/ContextImpl;->mClassLoader:Ljava/lang/ClassLoader;
-Landroid/app/ContextImpl;->mContentResolver:Landroid/app/ContextImpl$ApplicationContentResolver;
-Landroid/app/ContextImpl;->mMainThread:Landroid/app/ActivityThread;
-Landroid/app/ContextImpl;->mOpPackageName:Ljava/lang/String;
-Landroid/app/ContextImpl;->mOuterContext:Landroid/content/Context;
-Landroid/app/ContextImpl;->mPackageInfo:Landroid/app/LoadedApk;
-Landroid/app/ContextImpl;->mPackageManager:Landroid/content/pm/PackageManager;
-Landroid/app/ContextImpl;->mResources:Landroid/content/res/Resources;
-Landroid/app/ContextImpl;->mServiceCache:[Ljava/lang/Object;
-Landroid/app/ContextImpl;->mTheme:Landroid/content/res/Resources$Theme;
-Landroid/app/ContextImpl;->mThemeResource:I
-Landroid/app/ContextImpl;->sSharedPrefsCache:Landroid/util/ArrayMap;
-Landroid/app/ContextImpl;->scheduleFinalCleanup(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/app/ContextImpl;->setOuterContext(Landroid/content/Context;)V
-Landroid/app/DatePickerDialog;->mDatePicker:Landroid/widget/DatePicker;
-Landroid/app/Dialog;->CANCEL:I
-Landroid/app/Dialog;->dismissDialog()V
-Landroid/app/Dialog;->mCancelMessage:Landroid/os/Message;
-Landroid/app/Dialog;->mDismissMessage:Landroid/os/Message;
-Landroid/app/Dialog;->mListenersHandler:Landroid/os/Handler;
-Landroid/app/Dialog;->mOwnerActivity:Landroid/app/Activity;
-Landroid/app/Dialog;->mShowMessage:Landroid/os/Message;
-Landroid/app/DialogFragment;->showAllowingStateLoss(Landroid/app/FragmentManager;Ljava/lang/String;)V
-Landroid/app/DownloadManager$Request;->mUri:Landroid/net/Uri;
-Landroid/app/DownloadManager;->setAccessFilename(Z)V
-Landroid/app/Fragment;->mChildFragmentManager:Landroid/app/FragmentManagerImpl;
-Landroid/app/Fragment;->mWho:Ljava/lang/String;
-Landroid/app/FragmentManagerImpl;->mAdded:Ljava/util/ArrayList;
-Landroid/app/FragmentManagerImpl;->mStateSaved:Z
-Landroid/app/FragmentManagerImpl;->noteStateNotSaved()V
-Landroid/app/IActivityController$Stub;-><init>()V
-Landroid/app/IActivityManager$Stub$Proxy;->getConfiguration()Landroid/content/res/Configuration;
-Landroid/app/IActivityManager$Stub$Proxy;->getLaunchedFromUid(Landroid/os/IBinder;)I
-Landroid/app/IActivityManager$Stub$Proxy;->getProcessLimit()I
-Landroid/app/IActivityManager$Stub$Proxy;->getProcessPss([I)[J
-Landroid/app/IActivityManager$Stub$Proxy;->isAppForeground(I)Z
-Landroid/app/IActivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/app/IActivityManager;->bindService(Landroid/app/IApplicationThread;Landroid/os/IBinder;Landroid/content/Intent;Ljava/lang/String;Landroid/app/IServiceConnection;ILjava/lang/String;I)I
-Landroid/app/IActivityManager;->broadcastIntent(Landroid/app/IApplicationThread;Landroid/content/Intent;Ljava/lang/String;Landroid/content/IIntentReceiver;ILjava/lang/String;Landroid/os/Bundle;[Ljava/lang/String;ILandroid/os/Bundle;ZZI)I
-Landroid/app/IActivityManager;->cancelRecentsAnimation(Z)V
-Landroid/app/IActivityManager;->cancelTaskWindowTransition(I)V
-Landroid/app/IActivityManager;->closeSystemDialogs(Ljava/lang/String;)V
-Landroid/app/IActivityManager;->finishActivity(Landroid/os/IBinder;ILandroid/content/Intent;I)Z
-Landroid/app/IActivityManager;->finishReceiver(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/Bundle;ZI)V
-Landroid/app/IActivityManager;->forceStopPackage(Ljava/lang/String;I)V
-Landroid/app/IActivityManager;->getConfiguration()Landroid/content/res/Configuration;
-Landroid/app/IActivityManager;->getCurrentUser()Landroid/content/pm/UserInfo;
-Landroid/app/IActivityManager;->getFilteredTasks(III)Ljava/util/List;
-Landroid/app/IActivityManager;->getIntentSender(ILjava/lang/String;Landroid/os/IBinder;Ljava/lang/String;I[Landroid/content/Intent;[Ljava/lang/String;ILandroid/os/Bundle;I)Landroid/content/IIntentSender;
-Landroid/app/IActivityManager;->getLaunchedFromPackage(Landroid/os/IBinder;)Ljava/lang/String;
-Landroid/app/IActivityManager;->getLockTaskModeState()I
-Landroid/app/IActivityManager;->getProcessMemoryInfo([I)[Landroid/os/Debug$MemoryInfo;
-Landroid/app/IActivityManager;->getProviderMimeType(Landroid/net/Uri;I)Ljava/lang/String;
-Landroid/app/IActivityManager;->getRecentTasks(III)Landroid/content/pm/ParceledListSlice;
-Landroid/app/IActivityManager;->getRunningAppProcesses()Ljava/util/List;
-Landroid/app/IActivityManager;->getTaskForActivity(Landroid/os/IBinder;Z)I
-Landroid/app/IActivityManager;->getTaskSnapshot(IZ)Landroid/app/ActivityManager$TaskSnapshot;
-Landroid/app/IActivityManager;->moveActivityTaskToBack(Landroid/os/IBinder;Z)Z
-Landroid/app/IActivityManager;->moveTaskToFront(IILandroid/os/Bundle;)V
-Landroid/app/IActivityManager;->publishContentProviders(Landroid/app/IApplicationThread;Ljava/util/List;)V
-Landroid/app/IActivityManager;->registerTaskStackListener(Landroid/app/ITaskStackListener;)V
-Landroid/app/IActivityManager;->removeTask(I)Z
-Landroid/app/IActivityManager;->requestBugReport(I)V
-Landroid/app/IActivityManager;->resumeAppSwitches()V
-Landroid/app/IActivityManager;->setActivityController(Landroid/app/IActivityController;Z)V
-Landroid/app/IActivityManager;->setRequestedOrientation(Landroid/os/IBinder;I)V
-Landroid/app/IActivityManager;->setTaskResizeable(II)V
-Landroid/app/IActivityManager;->startActivity(Landroid/app/IApplicationThread;Ljava/lang/String;Landroid/content/Intent;Ljava/lang/String;Landroid/os/IBinder;Ljava/lang/String;IILandroid/app/ProfilerInfo;Landroid/os/Bundle;)I
-Landroid/app/IActivityManager;->startActivityAsUser(Landroid/app/IApplicationThread;Ljava/lang/String;Landroid/content/Intent;Ljava/lang/String;Landroid/os/IBinder;Ljava/lang/String;IILandroid/app/ProfilerInfo;Landroid/os/Bundle;I)I
-Landroid/app/IActivityManager;->startActivityFromRecents(ILandroid/os/Bundle;)I
-Landroid/app/IActivityManager;->startRecentsActivity(Landroid/content/Intent;Landroid/app/IAssistDataReceiver;Landroid/view/IRecentsAnimationRunner;)V
-Landroid/app/IActivityManager;->stopService(Landroid/app/IApplicationThread;Landroid/content/Intent;Ljava/lang/String;I)I
-Landroid/app/IActivityManager;->unbindService(Landroid/app/IServiceConnection;)Z
-Landroid/app/IActivityManager;->unstableProviderDied(Landroid/os/IBinder;)V
-Landroid/app/IAlarmManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/IAlarmManager$Stub;->TRANSACTION_remove:I
-Landroid/app/IAlarmManager$Stub;->TRANSACTION_set:I
-Landroid/app/IAlarmManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IAlarmManager;
-Landroid/app/IAlarmManager;->setTime(J)Z
-Landroid/app/IAppTask;->getTaskInfo()Landroid/app/ActivityManager$RecentTaskInfo;
-Landroid/app/IApplicationThread;->scheduleTrimMemory(I)V
-Landroid/app/IAssistDataReceiver$Stub;-><init>()V
-Landroid/app/IAssistDataReceiver;->onHandleAssistData(Landroid/os/Bundle;)V
-Landroid/app/IAssistDataReceiver;->onHandleAssistScreenshot(Landroid/graphics/Bitmap;)V
-Landroid/app/INotificationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/INotificationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/INotificationManager;
-Landroid/app/INotificationManager;->cancelAllNotifications(Ljava/lang/String;I)V
-Landroid/app/INotificationManager;->cancelNotificationWithTag(Ljava/lang/String;Ljava/lang/String;II)V
-Landroid/app/INotificationManager;->cancelToast(Ljava/lang/String;Landroid/app/ITransientNotification;)V
-Landroid/app/INotificationManager;->enqueueToast(Ljava/lang/String;Landroid/app/ITransientNotification;II)V
-Landroid/app/IProcessObserver$Stub;-><init>()V
-Landroid/app/ISearchManager$Stub$Proxy;->getGlobalSearchActivity()Landroid/content/ComponentName;
-Landroid/app/ISearchManager$Stub$Proxy;->getWebSearchActivity()Landroid/content/ComponentName;
-Landroid/app/ISearchManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/ISearchManager;
-Landroid/app/IServiceConnection$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/IServiceConnection$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/app/IServiceConnection$Stub;-><init>()V
-Landroid/app/IServiceConnection$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IServiceConnection;
-Landroid/app/IStopUserCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/IStopUserCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/app/IStopUserCallback$Stub;-><init>()V
-Landroid/app/IStopUserCallback;->userStopped(I)V
-Landroid/app/IUiModeManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/IWallpaperManager;->getWallpaper(Ljava/lang/String;Landroid/app/IWallpaperManagerCallback;ILandroid/os/Bundle;I)Landroid/os/ParcelFileDescriptor;
-Landroid/app/Instrumentation;->execStartActivities(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Landroid/app/Activity;[Landroid/content/Intent;Landroid/os/Bundle;)V
-Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Landroid/app/Activity;Landroid/content/Intent;ILandroid/os/Bundle;)Landroid/app/Instrumentation$ActivityResult;
-Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Ljava/lang/String;Landroid/content/Intent;ILandroid/os/Bundle;)Landroid/app/Instrumentation$ActivityResult;
-Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Ljava/lang/String;Landroid/content/Intent;ILandroid/os/Bundle;Landroid/os/UserHandle;)Landroid/app/Instrumentation$ActivityResult;
-Landroid/app/IntentService;->mServiceHandler:Landroid/app/IntentService$ServiceHandler;
-Landroid/app/KeyguardManager;->dismissKeyguard(Landroid/app/Activity;Landroid/app/KeyguardManager$KeyguardDismissCallback;Landroid/os/Handler;)V
-Landroid/app/KeyguardManager;->isDeviceLocked(I)Z
-Landroid/app/LoadedApk$ReceiverDispatcher;->getIIntentReceiver()Landroid/content/IIntentReceiver;
-Landroid/app/LoadedApk$ReceiverDispatcher;->getIntentReceiver()Landroid/content/BroadcastReceiver;
-Landroid/app/LoadedApk$ReceiverDispatcher;->mContext:Landroid/content/Context;
-Landroid/app/LoadedApk$ReceiverDispatcher;->mReceiver:Landroid/content/BroadcastReceiver;
-Landroid/app/LoadedApk$ServiceDispatcher$InnerConnection;->mDispatcher:Ljava/lang/ref/WeakReference;
-Landroid/app/LoadedApk$ServiceDispatcher;-><init>(Landroid/content/ServiceConnection;Landroid/content/Context;Landroid/os/Handler;I)V
-Landroid/app/LoadedApk$ServiceDispatcher;->getIServiceConnection()Landroid/app/IServiceConnection;
-Landroid/app/LoadedApk$ServiceDispatcher;->mConnection:Landroid/content/ServiceConnection;
-Landroid/app/LoadedApk$ServiceDispatcher;->mContext:Landroid/content/Context;
-Landroid/app/LoadedApk;->getAssets()Landroid/content/res/AssetManager;
-Landroid/app/LoadedApk;->getClassLoader()Ljava/lang/ClassLoader;
-Landroid/app/LoadedApk;->getCompatibilityInfo()Landroid/content/res/CompatibilityInfo;
-Landroid/app/LoadedApk;->getDataDirFile()Ljava/io/File;
-Landroid/app/LoadedApk;->getResources()Landroid/content/res/Resources;
-Landroid/app/LoadedApk;->mActivityThread:Landroid/app/ActivityThread;
-Landroid/app/LoadedApk;->mAppDir:Ljava/lang/String;
-Landroid/app/LoadedApk;->mApplication:Landroid/app/Application;
-Landroid/app/LoadedApk;->mApplicationInfo:Landroid/content/pm/ApplicationInfo;
-Landroid/app/LoadedApk;->mBaseClassLoader:Ljava/lang/ClassLoader;
-Landroid/app/LoadedApk;->mClassLoader:Ljava/lang/ClassLoader;
-Landroid/app/LoadedApk;->mDataDir:Ljava/lang/String;
-Landroid/app/LoadedApk;->mDataDirFile:Ljava/io/File;
-Landroid/app/LoadedApk;->mDisplayAdjustments:Landroid/view/DisplayAdjustments;
-Landroid/app/LoadedApk;->mLibDir:Ljava/lang/String;
-Landroid/app/LoadedApk;->mPackageName:Ljava/lang/String;
-Landroid/app/LoadedApk;->mReceivers:Landroid/util/ArrayMap;
-Landroid/app/LoadedApk;->mResDir:Ljava/lang/String;
-Landroid/app/LoadedApk;->mResources:Landroid/content/res/Resources;
-Landroid/app/LoadedApk;->mServices:Landroid/util/ArrayMap;
-Landroid/app/LoadedApk;->mSplitResDirs:[Ljava/lang/String;
-Landroid/app/LoadedApk;->makeApplication(ZLandroid/app/Instrumentation;)Landroid/app/Application;
-Landroid/app/LoadedApk;->rewriteRValues(Ljava/lang/ClassLoader;Ljava/lang/String;I)V
-Landroid/app/LocalActivityManager;->mActivities:Ljava/util/Map;
-Landroid/app/LocalActivityManager;->mActivityArray:Ljava/util/ArrayList;
-Landroid/app/LocalActivityManager;->mParent:Landroid/app/Activity;
-Landroid/app/LocalActivityManager;->mResumed:Landroid/app/LocalActivityManager$LocalActivityRecord;
-Landroid/app/LocalActivityManager;->mSingleMode:Z
-Landroid/app/NativeActivity;->hideIme(I)V
-Landroid/app/NativeActivity;->setWindowFlags(II)V
-Landroid/app/NativeActivity;->setWindowFormat(I)V
-Landroid/app/NativeActivity;->showIme(I)V
-Landroid/app/Notification$Action;->mIcon:Landroid/graphics/drawable/Icon;
-Landroid/app/Notification$Builder;->mActions:Ljava/util/ArrayList;
-Landroid/app/Notification$Builder;->makePublicContentView()Landroid/widget/RemoteViews;
-Landroid/app/Notification$Builder;->setChannel(Ljava/lang/String;)Landroid/app/Notification$Builder;
-Landroid/app/Notification$Builder;->setTimeout(J)Landroid/app/Notification$Builder;
-Landroid/app/Notification$TvExtender;->getChannel()Ljava/lang/String;
-Landroid/app/Notification;-><init>(Landroid/content/Context;ILjava/lang/CharSequence;JLjava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/content/Intent;)V
-Landroid/app/Notification;->getChannel()Ljava/lang/String;
-Landroid/app/Notification;->getNotificationStyleClass(Ljava/lang/String;)Ljava/lang/Class;
-Landroid/app/Notification;->getTimeout()J
-Landroid/app/Notification;->isGroupSummary()Z
-Landroid/app/Notification;->mChannelId:Ljava/lang/String;
-Landroid/app/Notification;->mGroupKey:Ljava/lang/String;
-Landroid/app/Notification;->mLargeIcon:Landroid/graphics/drawable/Icon;
-Landroid/app/Notification;->mSmallIcon:Landroid/graphics/drawable/Icon;
-Landroid/app/Notification;->setLatestEventInfo(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/app/PendingIntent;)V
-Landroid/app/Notification;->setSmallIcon(Landroid/graphics/drawable/Icon;)V
-Landroid/app/NotificationManager;->cancelAsUser(Ljava/lang/String;ILandroid/os/UserHandle;)V
-Landroid/app/NotificationManager;->getService()Landroid/app/INotificationManager;
-Landroid/app/NotificationManager;->notifyAsUser(Ljava/lang/String;ILandroid/app/Notification;Landroid/os/UserHandle;)V
-Landroid/app/NotificationManager;->sService:Landroid/app/INotificationManager;
-Landroid/app/PendingIntent;->getActivityAsUser(Landroid/content/Context;ILandroid/content/Intent;ILandroid/os/Bundle;Landroid/os/UserHandle;)Landroid/app/PendingIntent;
-Landroid/app/PendingIntent;->getIntent()Landroid/content/Intent;
-Landroid/app/PendingIntent;->isActivity()Z
-Landroid/app/PictureInPictureArgs$Builder;
-Landroid/app/PictureInPictureArgs$Builder;-><init>()V
-Landroid/app/PictureInPictureArgs$Builder;->build()Landroid/app/PictureInPictureArgs;
-Landroid/app/PictureInPictureArgs$Builder;->setActions(Ljava/util/List;)Landroid/app/PictureInPictureArgs$Builder;
-Landroid/app/PictureInPictureArgs$Builder;->setAspectRatio(Landroid/util/Rational;)Landroid/app/PictureInPictureArgs$Builder;
-Landroid/app/PictureInPictureArgs$Builder;->setSourceRectHint(Landroid/graphics/Rect;)Landroid/app/PictureInPictureArgs$Builder;
-Landroid/app/PictureInPictureArgs;
-Landroid/app/PictureInPictureArgs;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/app/PictureInPictureArgs;->convert(Landroid/app/PictureInPictureArgs;)Landroid/app/PictureInPictureParams;
-Landroid/app/PictureInPictureArgs;->convert(Landroid/app/PictureInPictureParams;)Landroid/app/PictureInPictureArgs;
-Landroid/app/PictureInPictureParams;->getAspectRatio()F
-Landroid/app/Presentation;->createPresentationContext(Landroid/content/Context;Landroid/view/Display;I)Landroid/content/Context;
-Landroid/app/ProgressDialog;->mProgressNumber:Landroid/widget/TextView;
-Landroid/app/QueuedWork;->addFinisher(Ljava/lang/Runnable;)V
-Landroid/app/QueuedWork;->removeFinisher(Ljava/lang/Runnable;)V
-Landroid/app/QueuedWork;->sFinishers:Ljava/util/LinkedList;
-Landroid/app/ResourcesManager;->appendLibAssetForMainAssetPath(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/app/ResourcesManager;->getInstance()Landroid/app/ResourcesManager;
-Landroid/app/ResourcesManager;->mActivityResourceReferences:Ljava/util/WeakHashMap;
-Landroid/app/ResourcesManager;->mResConfiguration:Landroid/content/res/Configuration;
-Landroid/app/ResourcesManager;->mResourceImpls:Landroid/util/ArrayMap;
-Landroid/app/ResourcesManager;->mResourceReferences:Ljava/util/ArrayList;
-Landroid/app/ResultInfo;->mData:Landroid/content/Intent;
-Landroid/app/ResultInfo;->mResultWho:Ljava/lang/String;
-Landroid/app/Service;->attach(Landroid/content/Context;Landroid/app/ActivityThread;Ljava/lang/String;Landroid/os/IBinder;Landroid/app/Application;Ljava/lang/Object;)V
-Landroid/app/Service;->mActivityManager:Landroid/app/IActivityManager;
-Landroid/app/Service;->mApplication:Landroid/app/Application;
-Landroid/app/Service;->mClassName:Ljava/lang/String;
-Landroid/app/Service;->mStartCompatibility:Z
-Landroid/app/Service;->mThread:Landroid/app/ActivityThread;
-Landroid/app/Service;->mToken:Landroid/os/IBinder;
-Landroid/app/Service;->setForeground(Z)V
-Landroid/app/SharedPreferencesImpl;-><init>(Ljava/io/File;I)V
-Landroid/app/SharedPreferencesImpl;->mFile:Ljava/io/File;
-Landroid/app/SharedPreferencesImpl;->startReloadIfChangedUnexpectedly()V
-Landroid/app/StatusBarManager;->collapsePanels()V
-Landroid/app/StatusBarManager;->disable(I)V
-Landroid/app/StatusBarManager;->expandNotificationsPanel()V
-Landroid/app/StatusBarManager;->expandSettingsPanel()V
-Landroid/app/StatusBarManager;->expandSettingsPanel(Ljava/lang/String;)V
-Landroid/app/StatusBarManager;->getService()Lcom/android/internal/statusbar/IStatusBarService;
-Landroid/app/StatusBarManager;->removeIcon(Ljava/lang/String;)V
-Landroid/app/StatusBarManager;->setIcon(Ljava/lang/String;IILjava/lang/String;)V
-Landroid/app/TaskStackListener;-><init>()V
-Landroid/app/TaskStackListener;->onActivityDismissingDockedStack()V
-Landroid/app/TaskStackListener;->onActivityForcedResizable(Ljava/lang/String;II)V
-Landroid/app/TaskStackListener;->onActivityLaunchOnSecondaryDisplayFailed()V
-Landroid/app/TaskStackListener;->onActivityPinned(Ljava/lang/String;III)V
-Landroid/app/TaskStackListener;->onActivityRequestedOrientationChanged(II)V
-Landroid/app/TaskStackListener;->onActivityUnpinned()V
-Landroid/app/TaskStackListener;->onPinnedActivityRestartAttempt(Z)V
-Landroid/app/TaskStackListener;->onPinnedStackAnimationEnded()V
-Landroid/app/TaskStackListener;->onPinnedStackAnimationStarted()V
-Landroid/app/TaskStackListener;->onTaskMovedToFront(I)V
-Landroid/app/TaskStackListener;->onTaskProfileLocked(II)V
-Landroid/app/TaskStackListener;->onTaskRemoved(I)V
-Landroid/app/TaskStackListener;->onTaskSnapshotChanged(ILandroid/app/ActivityManager$TaskSnapshot;)V
-Landroid/app/TaskStackListener;->onTaskStackChanged()V
-Landroid/app/TimePickerDialog;->mTimePicker:Landroid/widget/TimePicker;
-Landroid/app/Vr2dDisplayProperties$Builder;-><init>()V
-Landroid/app/Vr2dDisplayProperties$Builder;->build()Landroid/app/Vr2dDisplayProperties;
-Landroid/app/Vr2dDisplayProperties$Builder;->setEnabled(Z)Landroid/app/Vr2dDisplayProperties$Builder;
-Landroid/app/Vr2dDisplayProperties;-><init>(III)V
-Landroid/app/VrManager;->getPersistentVrModeEnabled()Z
-Landroid/app/VrManager;->mService:Landroid/service/vr/IVrManager;
-Landroid/app/VrManager;->registerVrStateCallback(Landroid/app/VrStateCallback;Landroid/os/Handler;)V
-Landroid/app/VrManager;->setVr2dDisplayProperties(Landroid/app/Vr2dDisplayProperties;)V
-Landroid/app/VrManager;->unregisterVrStateCallback(Landroid/app/VrStateCallback;)V
-Landroid/app/VrStateCallback;-><init>()V
-Landroid/app/VrStateCallback;->onPersistentVrStateChanged(Z)V
-Landroid/app/WallpaperColors;-><init>(Landroid/graphics/Color;Landroid/graphics/Color;Landroid/graphics/Color;I)V
-Landroid/app/WallpaperColors;->getColorHints()I
-Landroid/app/WallpaperManager;->getBitmap()Landroid/graphics/Bitmap;
-Landroid/app/WallpaperManager;->getBitmap(Z)Landroid/graphics/Bitmap;
-Landroid/app/WallpaperManager;->getIWallpaperManager()Landroid/app/IWallpaperManager;
-Landroid/app/WallpaperManager;->openDefaultWallpaper(Landroid/content/Context;I)Ljava/io/InputStream;
-Landroid/app/WallpaperManager;->sGlobals:Landroid/app/WallpaperManager$Globals;
-Landroid/app/WallpaperManager;->setBitmap(Landroid/graphics/Bitmap;Landroid/graphics/Rect;ZII)I
-Landroid/app/admin/DevicePolicyManager;->createAndInitializeUser(Landroid/content/ComponentName;Ljava/lang/String;Ljava/lang/String;Landroid/content/ComponentName;Landroid/os/Bundle;)Landroid/os/UserHandle;
-Landroid/app/admin/DevicePolicyManager;->createUser(Landroid/content/ComponentName;Ljava/lang/String;)Landroid/os/UserHandle;
-Landroid/app/admin/DevicePolicyManager;->getDeviceInitializerApp()Ljava/lang/String;
-Landroid/app/admin/DevicePolicyManager;->getDeviceInitializerComponent()Landroid/content/ComponentName;
-Landroid/app/admin/DevicePolicyManager;->getMandatoryBackupTransport()Landroid/content/ComponentName;
-Landroid/app/admin/DevicePolicyManager;->getProfileOwnerAsUser(I)Landroid/content/ComponentName;
-Landroid/app/admin/DevicePolicyManager;->getTrustAgentConfiguration(Landroid/content/ComponentName;Landroid/content/ComponentName;I)Ljava/util/List;
-Landroid/app/admin/DevicePolicyManager;->packageHasActiveAdmins(Ljava/lang/String;I)Z
-Landroid/app/admin/DevicePolicyManager;->setActiveAdmin(Landroid/content/ComponentName;Z)V
-Landroid/app/admin/DevicePolicyManager;->setActiveAdmin(Landroid/content/ComponentName;ZI)V
-Landroid/app/admin/DevicePolicyManager;->setDefaultSmsApplication(Landroid/content/ComponentName;Ljava/lang/String;)V
-Landroid/app/admin/DevicePolicyManager;->throwIfParentInstance(Ljava/lang/String;)V
-Landroid/app/admin/IDevicePolicyManager$Stub;->TRANSACTION_packageHasActiveAdmins:I
-Landroid/app/admin/IDevicePolicyManager$Stub;->TRANSACTION_removeActiveAdmin:I
-Landroid/app/admin/IDevicePolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/admin/IDevicePolicyManager;
-Landroid/app/admin/SecurityLog$SecurityEvent;-><init>([B)V
-Landroid/app/backup/BackupDataInput$EntityHeader;->dataSize:I
-Landroid/app/backup/BackupDataInput$EntityHeader;->key:Ljava/lang/String;
-Landroid/app/backup/BackupDataInputStream;->dataSize:I
-Landroid/app/backup/BackupDataInputStream;->key:Ljava/lang/String;
-Landroid/app/backup/BackupDataOutput;->mBackupWriter:J
-Landroid/app/backup/BackupHelperDispatcher$Header;->chunkSize:I
-Landroid/app/backup/BackupHelperDispatcher$Header;->keyPrefix:Ljava/lang/String;
-Landroid/app/backup/FileBackupHelperBase;->writeNewStateDescription(Landroid/os/ParcelFileDescriptor;)V
-Landroid/app/backup/FullBackup;->backupToTar(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/app/backup/FullBackupDataOutput;)I
-Landroid/app/backup/FullBackupDataOutput;-><init>(Landroid/os/ParcelFileDescriptor;)V
-Landroid/app/backup/FullBackupDataOutput;->addSize(J)V
-Landroid/app/backup/FullBackupDataOutput;->mData:Landroid/app/backup/BackupDataOutput;
-Landroid/app/backup/IBackupManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/backup/IBackupManager;
-Landroid/app/job/IJobCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/job/IJobCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/app/job/IJobCallback$Stub;-><init>()V
-Landroid/app/job/IJobCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobCallback;
-Landroid/app/job/IJobCallback;->acknowledgeStartMessage(IZ)V
-Landroid/app/job/IJobCallback;->acknowledgeStopMessage(IZ)V
-Landroid/app/job/IJobCallback;->jobFinished(IZ)V
-Landroid/app/job/IJobScheduler$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/job/IJobScheduler$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobScheduler;
-Landroid/app/job/IJobService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/job/IJobService$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/app/job/IJobService$Stub;-><init>()V
-Landroid/app/job/IJobService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobService;
-Landroid/app/job/IJobService;->startJob(Landroid/app/job/JobParameters;)V
-Landroid/app/job/IJobService;->stopJob(Landroid/app/job/JobParameters;)V
-Landroid/app/job/JobInfo$Builder;->setEstimatedNetworkBytes(J)Landroid/app/job/JobInfo$Builder;
-Landroid/app/job/JobInfo$Builder;->setIsPrefetch(Z)Landroid/app/job/JobInfo$Builder;
-Landroid/app/job/JobInfo;->flags:I
-Landroid/app/job/JobInfo;->getEstimatedNetworkBytes()J
-Landroid/app/job/JobInfo;->jobId:I
-Landroid/app/job/JobInfo;->service:Landroid/content/ComponentName;
-Landroid/app/job/JobParameters;->callback:Landroid/os/IBinder;
-Landroid/app/job/JobParameters;->jobId:I
-Landroid/app/job/JobWorkItem;-><init>(Landroid/content/Intent;J)V
-Landroid/app/job/JobWorkItem;->getEstimatedNetworkBytes()J
-Landroid/app/slice/Slice$Builder;-><init>(Landroid/net/Uri;)V
-Landroid/app/slice/Slice$Builder;->addTimestamp(JLjava/lang/String;Ljava/util/List;)Landroid/app/slice/Slice$Builder;
-Landroid/app/slice/Slice$Builder;->setSpec(Landroid/app/slice/SliceSpec;)Landroid/app/slice/Slice$Builder;
-Landroid/app/slice/Slice;->EXTRA_SLIDER_VALUE:Ljava/lang/String;
-Landroid/app/slice/Slice;->SUBTYPE_SLIDER:Ljava/lang/String;
-Landroid/app/slice/SliceItem;->FORMAT_TIMESTAMP:Ljava/lang/String;
-Landroid/app/slice/SliceItem;->getTimestamp()J
-Landroid/app/slice/SliceManager;->bindSlice(Landroid/content/Intent;Ljava/util/List;)Landroid/app/slice/Slice;
-Landroid/app/slice/SliceManager;->bindSlice(Landroid/net/Uri;Ljava/util/List;)Landroid/app/slice/Slice;
-Landroid/app/slice/SliceManager;->pinSlice(Landroid/net/Uri;Ljava/util/List;)V
-Landroid/app/slice/SliceProvider;->onBindSlice(Landroid/net/Uri;Ljava/util/List;)Landroid/app/slice/Slice;
-Landroid/app/trust/ITrustManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/app/usage/StorageStats;->getCodeBytes()J
-Landroid/app/usage/StorageStatsManager;->getFreeBytes(Ljava/lang/String;)J
-Landroid/app/usage/StorageStatsManager;->getTotalBytes(Ljava/lang/String;)J
-Landroid/app/usage/StorageStatsManager;->isQuotaSupported(Ljava/lang/String;)Z
-Landroid/app/usage/StorageStatsManager;->queryExternalStatsForUser(Ljava/lang/String;Landroid/os/UserHandle;)Landroid/app/usage/ExternalStorageStats;
-Landroid/app/usage/StorageStatsManager;->queryStatsForPackage(Ljava/lang/String;Ljava/lang/String;Landroid/os/UserHandle;)Landroid/app/usage/StorageStats;
-Landroid/app/usage/StorageStatsManager;->queryStatsForUid(Ljava/lang/String;I)Landroid/app/usage/StorageStats;
-Landroid/app/usage/StorageStatsManager;->queryStatsForUser(Ljava/lang/String;Landroid/os/UserHandle;)Landroid/app/usage/StorageStats;
-Landroid/app/usage/UsageStats;->mLastEvent:I
-Landroid/app/usage/UsageStats;->mLaunchCount:I
-Landroid/app/usage/UsageStats;->mTotalTimeInForeground:J
-Landroid/app/usage/UsageStatsManager;->mService:Landroid/app/usage/IUsageStatsManager;
-Landroid/appwidget/AppWidgetHost;->sService:Lcom/android/internal/appwidget/IAppWidgetService;
-Landroid/appwidget/AppWidgetManager;->bindAppWidgetId(ILandroid/content/ComponentName;)V
-Landroid/appwidget/AppWidgetManager;->bindAppWidgetId(ILandroid/content/ComponentName;Landroid/os/Bundle;)V
-Landroid/appwidget/AppWidgetManager;->bindAppWidgetIdIfAllowed(IILandroid/content/ComponentName;Landroid/os/Bundle;)Z
-Landroid/appwidget/AppWidgetManager;->mService:Lcom/android/internal/appwidget/IAppWidgetService;
-Landroid/appwidget/AppWidgetProviderInfo;->providerInfo:Landroid/content/pm/ActivityInfo;
-Landroid/bluetooth/BluetoothA2dp;->ACTION_ACTIVE_DEVICE_CHANGED:Ljava/lang/String;
-Landroid/bluetooth/BluetoothA2dp;->ACTION_CODEC_CONFIG_CHANGED:Ljava/lang/String;
-Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_NOT_SUPPORTED:I
-Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_PREF_DISABLED:I
-Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_PREF_ENABLED:I
-Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_PREF_UNKNOWN:I
-Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_SUPPORTED:I
-Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_SUPPORT_UNKNOWN:I
-Landroid/bluetooth/BluetoothA2dp;->connect(Landroid/bluetooth/BluetoothDevice;)Z
-Landroid/bluetooth/BluetoothA2dp;->disableOptionalCodecs(Landroid/bluetooth/BluetoothDevice;)V
-Landroid/bluetooth/BluetoothA2dp;->enableOptionalCodecs(Landroid/bluetooth/BluetoothDevice;)V
-Landroid/bluetooth/BluetoothA2dp;->getActiveDevice()Landroid/bluetooth/BluetoothDevice;
-Landroid/bluetooth/BluetoothA2dp;->getCodecStatus(Landroid/bluetooth/BluetoothDevice;)Landroid/bluetooth/BluetoothCodecStatus;
-Landroid/bluetooth/BluetoothA2dp;->getOptionalCodecsEnabled(Landroid/bluetooth/BluetoothDevice;)I
-Landroid/bluetooth/BluetoothA2dp;->setActiveDevice(Landroid/bluetooth/BluetoothDevice;)Z
-Landroid/bluetooth/BluetoothA2dp;->setCodecConfigPreference(Landroid/bluetooth/BluetoothDevice;Landroid/bluetooth/BluetoothCodecConfig;)V
-Landroid/bluetooth/BluetoothA2dp;->setOptionalCodecsEnabled(Landroid/bluetooth/BluetoothDevice;I)V
-Landroid/bluetooth/BluetoothA2dp;->supportsOptionalCodecs(Landroid/bluetooth/BluetoothDevice;)I
-Landroid/bluetooth/BluetoothAdapter;->disable(Z)Z
-Landroid/bluetooth/BluetoothAdapter;->factoryReset()Z
-Landroid/bluetooth/BluetoothAdapter;->getDiscoverableTimeout()I
-Landroid/bluetooth/BluetoothAdapter;->getLeState()I
-Landroid/bluetooth/BluetoothAdapter;->mService:Landroid/bluetooth/IBluetooth;
-Landroid/bluetooth/BluetoothAdapter;->setScanMode(I)Z
-Landroid/bluetooth/BluetoothAdapter;->setScanMode(II)Z
-Landroid/bluetooth/BluetoothCodecConfig;
-Landroid/bluetooth/BluetoothCodecConfig;-><init>(IIIIIJJJJ)V
-Landroid/bluetooth/BluetoothCodecConfig;->BITS_PER_SAMPLE_16:I
-Landroid/bluetooth/BluetoothCodecConfig;->BITS_PER_SAMPLE_24:I
-Landroid/bluetooth/BluetoothCodecConfig;->BITS_PER_SAMPLE_32:I
-Landroid/bluetooth/BluetoothCodecConfig;->BITS_PER_SAMPLE_NONE:I
-Landroid/bluetooth/BluetoothCodecConfig;->CHANNEL_MODE_MONO:I
-Landroid/bluetooth/BluetoothCodecConfig;->CHANNEL_MODE_NONE:I
-Landroid/bluetooth/BluetoothCodecConfig;->CHANNEL_MODE_STEREO:I
-Landroid/bluetooth/BluetoothCodecConfig;->CODEC_PRIORITY_DEFAULT:I
-Landroid/bluetooth/BluetoothCodecConfig;->CODEC_PRIORITY_DISABLED:I
-Landroid/bluetooth/BluetoothCodecConfig;->CODEC_PRIORITY_HIGHEST:I
-Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_176400:I
-Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_192000:I
-Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_44100:I
-Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_48000:I
-Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_88200:I
-Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_96000:I
-Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_NONE:I
-Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_AAC:I
-Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_APTX:I
-Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_APTX_HD:I
-Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_INVALID:I
-Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_LDAC:I
-Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_MAX:I
-Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_SBC:I
-Landroid/bluetooth/BluetoothCodecConfig;->getBitsPerSample()I
-Landroid/bluetooth/BluetoothCodecConfig;->getChannelMode()I
-Landroid/bluetooth/BluetoothCodecConfig;->getCodecPriority()I
-Landroid/bluetooth/BluetoothCodecConfig;->getCodecSpecific1()J
-Landroid/bluetooth/BluetoothCodecConfig;->getCodecSpecific2()J
-Landroid/bluetooth/BluetoothCodecConfig;->getCodecSpecific3()J
-Landroid/bluetooth/BluetoothCodecConfig;->getCodecSpecific4()J
-Landroid/bluetooth/BluetoothCodecConfig;->getCodecType()I
-Landroid/bluetooth/BluetoothCodecConfig;->getSampleRate()I
-Landroid/bluetooth/BluetoothCodecConfig;->setCodecPriority(I)V
-Landroid/bluetooth/BluetoothCodecStatus;
-Landroid/bluetooth/BluetoothCodecStatus;->EXTRA_CODEC_STATUS:Ljava/lang/String;
-Landroid/bluetooth/BluetoothCodecStatus;->getCodecConfig()Landroid/bluetooth/BluetoothCodecConfig;
-Landroid/bluetooth/BluetoothCodecStatus;->getCodecsLocalCapabilities()[Landroid/bluetooth/BluetoothCodecConfig;
-Landroid/bluetooth/BluetoothCodecStatus;->getCodecsSelectableCapabilities()[Landroid/bluetooth/BluetoothCodecConfig;
-Landroid/bluetooth/BluetoothDevice;->createBond(I)Z
-Landroid/bluetooth/BluetoothDevice;->getAlias()Ljava/lang/String;
-Landroid/bluetooth/BluetoothDevice;->getAliasName()Ljava/lang/String;
-Landroid/bluetooth/BluetoothGatt;->mAuthRetryState:I
-Landroid/bluetooth/BluetoothGatt;->mClientIf:I
-Landroid/bluetooth/BluetoothGatt;->refresh()Z
-Landroid/bluetooth/BluetoothGattCharacteristic;->mInstance:I
-Landroid/bluetooth/BluetoothGattCharacteristic;->mService:Landroid/bluetooth/BluetoothGattService;
-Landroid/bluetooth/BluetoothGattDescriptor;->mCharacteristic:Landroid/bluetooth/BluetoothGattCharacteristic;
-Landroid/bluetooth/BluetoothGattDescriptor;->mInstance:I
-Landroid/bluetooth/BluetoothHeadset;->ACTION_ACTIVE_DEVICE_CHANGED:Ljava/lang/String;
-Landroid/bluetooth/BluetoothHeadset;->close()V
-Landroid/bluetooth/BluetoothHeadset;->connectAudio()Z
-Landroid/bluetooth/BluetoothHeadset;->disconnectAudio()Z
-Landroid/bluetooth/BluetoothHeadset;->getActiveDevice()Landroid/bluetooth/BluetoothDevice;
-Landroid/bluetooth/BluetoothHeadset;->phoneStateChanged(IIILjava/lang/String;I)V
-Landroid/bluetooth/BluetoothHeadset;->setActiveDevice(Landroid/bluetooth/BluetoothDevice;)Z
-Landroid/bluetooth/BluetoothHeadset;->startScoUsingVirtualVoiceCall()Z
-Landroid/bluetooth/BluetoothHeadset;->stopScoUsingVirtualVoiceCall()Z
-Landroid/bluetooth/BluetoothHearingAid;->ACTION_ACTIVE_DEVICE_CHANGED:Ljava/lang/String;
-Landroid/bluetooth/BluetoothHearingAid;->getActiveDevices()Ljava/util/List;
-Landroid/bluetooth/BluetoothHearingAid;->setActiveDevice(Landroid/bluetooth/BluetoothDevice;)Z
-Landroid/bluetooth/BluetoothMapClient;->sendMessage(Landroid/bluetooth/BluetoothDevice;[Landroid/net/Uri;Ljava/lang/String;Landroid/app/PendingIntent;Landroid/app/PendingIntent;)Z
-Landroid/bluetooth/BluetoothPan;-><init>(Landroid/content/Context;Landroid/bluetooth/BluetoothProfile$ServiceListener;)V
-Landroid/bluetooth/BluetoothPan;->close()V
-Landroid/bluetooth/BluetoothPan;->connect(Landroid/bluetooth/BluetoothDevice;)Z
-Landroid/bluetooth/BluetoothPan;->disconnect(Landroid/bluetooth/BluetoothDevice;)Z
-Landroid/bluetooth/BluetoothPan;->doBind()Z
-Landroid/bluetooth/BluetoothPan;->isEnabled()Z
-Landroid/bluetooth/BluetoothPan;->isTetheringOn()Z
-Landroid/bluetooth/BluetoothPan;->isValidDevice(Landroid/bluetooth/BluetoothDevice;)Z
-Landroid/bluetooth/BluetoothPan;->log(Ljava/lang/String;)V
-Landroid/bluetooth/BluetoothPan;->setBluetoothTethering(Z)V
-Landroid/bluetooth/BluetoothProfile;->PAN:I
-Landroid/bluetooth/BluetoothSocket;->mPfd:Landroid/os/ParcelFileDescriptor;
-Landroid/bluetooth/BluetoothUuid;->RESERVED_UUIDS:[Landroid/os/ParcelUuid;
-Landroid/bluetooth/IBluetooth$Stub$Proxy;->getAddress()Ljava/lang/String;
-Landroid/bluetooth/IBluetooth$Stub$Proxy;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I
-Landroid/bluetooth/IBluetooth$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetooth;
-Landroid/bluetooth/IBluetooth;->getAddress()Ljava/lang/String;
-Landroid/bluetooth/IBluetooth;->sendConnectionStateChange(Landroid/bluetooth/BluetoothDevice;III)V
-Landroid/bluetooth/IBluetoothManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/bluetooth/IBluetoothManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothManager;
-Landroid/bluetooth/le/ScanRecord;->parseFromBytes([B)Landroid/bluetooth/le/ScanRecord;
-Landroid/companion/AssociationRequest;->getDeviceFilters()Ljava/util/List;
-Landroid/companion/AssociationRequest;->isSingleDevice()Z
-Landroid/companion/BluetoothDeviceFilter;->getAddress()Ljava/lang/String;
-Landroid/companion/BluetoothDeviceFilterUtils;->getDeviceDisplayNameInternal(Landroid/bluetooth/BluetoothDevice;)Ljava/lang/String;
-Landroid/companion/BluetoothDeviceFilterUtils;->getDeviceDisplayNameInternal(Landroid/net/wifi/ScanResult;)Ljava/lang/String;
-Landroid/companion/BluetoothDeviceFilterUtils;->getDeviceMacAddress(Landroid/os/Parcelable;)Ljava/lang/String;
-Landroid/companion/BluetoothLeDeviceFilter;->getScanFilter()Landroid/bluetooth/le/ScanFilter;
-Landroid/companion/DeviceFilter;->getDeviceDisplayName(Landroid/os/Parcelable;)Ljava/lang/String;
-Landroid/companion/DeviceFilter;->matches(Landroid/os/Parcelable;)Z
-Landroid/companion/ICompanionDeviceDiscoveryService$Stub;-><init>()V
-Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelected(Ljava/lang/String;ILjava/lang/String;)V
-Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelectionCancel()V
-Landroid/companion/IFindDeviceCallback;->onSuccess(Landroid/app/PendingIntent;)V
-Landroid/content/AsyncTaskLoader;->mExecutor:Ljava/util/concurrent/Executor;
-Landroid/content/BroadcastReceiver$PendingResult;-><init>(ILjava/lang/String;Landroid/os/Bundle;IZZLandroid/os/IBinder;II)V
-Landroid/content/BroadcastReceiver$PendingResult;->mAbortBroadcast:Z
-Landroid/content/BroadcastReceiver$PendingResult;->mFinished:Z
-Landroid/content/BroadcastReceiver$PendingResult;->mFlags:I
-Landroid/content/BroadcastReceiver$PendingResult;->mInitialStickyHint:Z
-Landroid/content/BroadcastReceiver$PendingResult;->mOrderedHint:Z
-Landroid/content/BroadcastReceiver$PendingResult;->mResultCode:I
-Landroid/content/BroadcastReceiver$PendingResult;->mResultData:Ljava/lang/String;
-Landroid/content/BroadcastReceiver$PendingResult;->mResultExtras:Landroid/os/Bundle;
-Landroid/content/BroadcastReceiver$PendingResult;->mSendingUser:I
-Landroid/content/BroadcastReceiver$PendingResult;->mToken:Landroid/os/IBinder;
-Landroid/content/BroadcastReceiver$PendingResult;->mType:I
-Landroid/content/BroadcastReceiver;->getPendingResult()Landroid/content/BroadcastReceiver$PendingResult;
-Landroid/content/BroadcastReceiver;->setPendingResult(Landroid/content/BroadcastReceiver$PendingResult;)V
-Landroid/content/ClipData$Item;->mUri:Landroid/net/Uri;
-Landroid/content/ClipData;->addItem(Landroid/content/ClipData$Item;Landroid/content/ContentResolver;)V
-Landroid/content/ContentProvider;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;[Landroid/content/pm/PathPermission;)V
-Landroid/content/ContentProvider;->attachInfoForTesting(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V
-Landroid/content/ContentProvider;->coerceToLocalContentProvider(Landroid/content/IContentProvider;)Landroid/content/ContentProvider;
-Landroid/content/ContentProvider;->getIContentProvider()Landroid/content/IContentProvider;
-Landroid/content/ContentProvider;->mContext:Landroid/content/Context;
-Landroid/content/ContentProvider;->mPathPermissions:[Landroid/content/pm/PathPermission;
-Landroid/content/ContentProvider;->mReadPermission:Ljava/lang/String;
-Landroid/content/ContentProvider;->mWritePermission:Ljava/lang/String;
-Landroid/content/ContentProvider;->setAppOps(II)V
-Landroid/content/ContentProviderClient;->mContentProvider:Landroid/content/IContentProvider;
-Landroid/content/ContentProviderClient;->mPackageName:Ljava/lang/String;
-Landroid/content/ContentProviderOperation;->TYPE_DELETE:I
-Landroid/content/ContentProviderOperation;->TYPE_INSERT:I
-Landroid/content/ContentProviderOperation;->TYPE_UPDATE:I
-Landroid/content/ContentProviderOperation;->mSelection:Ljava/lang/String;
-Landroid/content/ContentProviderOperation;->mType:I
-Landroid/content/ContentProviderOperation;->mUri:Landroid/net/Uri;
-Landroid/content/ContentResolver;->acquireExistingProvider(Landroid/content/Context;Ljava/lang/String;)Landroid/content/IContentProvider;
-Landroid/content/ContentResolver;->acquireProvider(Landroid/content/Context;Ljava/lang/String;)Landroid/content/IContentProvider;
-Landroid/content/ContentResolver;->acquireProvider(Landroid/net/Uri;)Landroid/content/IContentProvider;
-Landroid/content/ContentResolver;->acquireProvider(Ljava/lang/String;)Landroid/content/IContentProvider;
-Landroid/content/ContentResolver;->acquireUnstableProvider(Landroid/content/Context;Ljava/lang/String;)Landroid/content/IContentProvider;
-Landroid/content/ContentResolver;->getContentService()Landroid/content/IContentService;
-Landroid/content/ContentResolver;->getSyncStatus(Landroid/accounts/Account;Ljava/lang/String;)Landroid/content/SyncStatusInfo;
-Landroid/content/ContentResolver;->mContext:Landroid/content/Context;
-Landroid/content/ContentResolver;->mPackageName:Ljava/lang/String;
-Landroid/content/ContentResolver;->registerContentObserver(Landroid/net/Uri;ZLandroid/database/ContentObserver;I)V
-Landroid/content/ContentResolver;->releaseProvider(Landroid/content/IContentProvider;)Z
-Landroid/content/ContentResolver;->releaseUnstableProvider(Landroid/content/IContentProvider;)Z
-Landroid/content/ContentResolver;->takePersistableUriPermission(Ljava/lang/String;Landroid/net/Uri;I)V
-Landroid/content/ContentResolver;->unstableProviderDied(Landroid/content/IContentProvider;)V
-Landroid/content/ContentValues;-><init>(Ljava/util/HashMap;)V
-Landroid/content/ContentValues;->getStringArrayList(Ljava/lang/String;)Ljava/util/ArrayList;
-Landroid/content/ContentValues;->mValues:Ljava/util/HashMap;
-Landroid/content/ContentValues;->putStringArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
-Landroid/content/Context;->getBasePackageName()Ljava/lang/String;
-Landroid/content/Context;->getOpPackageName()Ljava/lang/String;
-Landroid/content/Context;->getSharedPreferences(Ljava/io/File;I)Landroid/content/SharedPreferences;
-Landroid/content/Context;->getSharedPreferencesPath(Ljava/lang/String;)Ljava/io/File;
-Landroid/content/Context;->getSharedPrefsFile(Ljava/lang/String;)Ljava/io/File;
-Landroid/content/Context;->getThemeResId()I
-Landroid/content/Context;->registerReceiverAsUser(Landroid/content/BroadcastReceiver;Landroid/os/UserHandle;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;)Landroid/content/Intent;
-Landroid/content/Context;->sendBroadcastAsUser(Landroid/content/Intent;Landroid/os/UserHandle;Ljava/lang/String;I)V
-Landroid/content/Context;->sendOrderedBroadcastAsUser(Landroid/content/Intent;Landroid/os/UserHandle;Ljava/lang/String;ILandroid/content/BroadcastReceiver;Landroid/os/Handler;ILjava/lang/String;Landroid/os/Bundle;)V
-Landroid/content/Context;->sendOrderedBroadcastAsUser(Landroid/content/Intent;Landroid/os/UserHandle;Ljava/lang/String;ILandroid/os/Bundle;Landroid/content/BroadcastReceiver;Landroid/os/Handler;ILjava/lang/String;Landroid/os/Bundle;)V
-Landroid/content/Context;->startActivityAsUser(Landroid/content/Intent;Landroid/os/UserHandle;)V
-Landroid/content/Context;->startServiceAsUser(Landroid/content/Intent;Landroid/os/UserHandle;)Landroid/content/ComponentName;
-Landroid/content/ContextWrapper;->getDisplay()Landroid/view/Display;
-Landroid/content/ContextWrapper;->getSharedPreferences(Ljava/io/File;I)Landroid/content/SharedPreferences;
-Landroid/content/ContextWrapper;->getSharedPreferencesPath(Ljava/lang/String;)Ljava/io/File;
-Landroid/content/ContextWrapper;->getThemeResId()I
-Landroid/content/ContextWrapper;->mBase:Landroid/content/Context;
-Landroid/content/CursorLoader;->mCancellationSignal:Landroid/os/CancellationSignal;
-Landroid/content/CursorLoader;->mObserver:Landroid/content/Loader$ForceLoadContentObserver;
-Landroid/content/IClipboard$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/IClipboard$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IClipboard;
-Landroid/content/IContentProvider;->call(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
-Landroid/content/IContentService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/IContentService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IContentService;
-Landroid/content/IContentService;->cancelSync(Landroid/accounts/Account;Ljava/lang/String;Landroid/content/ComponentName;)V
-Landroid/content/IContentService;->getMasterSyncAutomatically()Z
-Landroid/content/IContentService;->setMasterSyncAutomatically(Z)V
-Landroid/content/IIntentReceiver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/IIntentReceiver$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/IIntentReceiver$Stub;-><init>()V
-Landroid/content/IIntentReceiver;->performReceive(Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;ZZI)V
-Landroid/content/IRestrictionsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IRestrictionsManager;
-Landroid/content/ISyncAdapter$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/ISyncAdapter$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/ISyncContext$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/ISyncContext$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/ISyncContext$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/ISyncContext;
-Landroid/content/ISyncStatusObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/ISyncStatusObserver$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/Intent;->ACTION_ALARM_CHANGED:Ljava/lang/String;
-Landroid/content/Intent;->ACTION_DEVICE_INITIALIZATION_WIZARD:Ljava/lang/String;
-Landroid/content/Intent;->ACTION_MASTER_CLEAR:Ljava/lang/String;
-Landroid/content/Intent;->ACTION_SERVICE_STATE:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_CDMA_DEFAULT_ROAMING_INDICATOR:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_CDMA_ROAMING_INDICATOR:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_CSS_INDICATOR:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_DATA_OPERATOR_ALPHA_LONG:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_DATA_OPERATOR_ALPHA_SHORT:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_DATA_OPERATOR_NUMERIC:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_DATA_RADIO_TECH:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_DATA_REG_STATE:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_DATA_ROAMING_TYPE:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_EMERGENCY_ONLY:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_IS_DATA_ROAMING_FROM_REGISTRATION:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_IS_USING_CARRIER_AGGREGATION:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_LTE_EARFCN_RSRP_BOOST:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_MANUAL:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_NETWORK_ID:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_OPERATOR_ALPHA_LONG:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_OPERATOR_ALPHA_SHORT:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_OPERATOR_NUMERIC:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_QUICK_VIEW_ADVANCED:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_SYSTEM_ID:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_VOICE_RADIO_TECH:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_VOICE_REG_STATE:Ljava/lang/String;
-Landroid/content/Intent;->EXTRA_VOICE_ROAMING_TYPE:Ljava/lang/String;
-Landroid/content/Intent;->getExtra(Ljava/lang/String;)Ljava/lang/Object;
-Landroid/content/Intent;->getIBinderExtra(Ljava/lang/String;)Landroid/os/IBinder;
-Landroid/content/Intent;->mExtras:Landroid/os/Bundle;
-Landroid/content/Intent;->prepareToLeaveProcess(Landroid/content/Context;)V
-Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/IBinder;)Landroid/content/Intent;
-Landroid/content/Intent;->resolveSystemService(Landroid/content/pm/PackageManager;I)Landroid/content/ComponentName;
-Landroid/content/Intent;->setAllowFds(Z)V
-Landroid/content/Intent;->toInsecureString()Ljava/lang/String;
-Landroid/content/IntentFilter;->mActions:Ljava/util/ArrayList;
-Landroid/content/IntentSender;-><init>(Landroid/content/IIntentSender;)V
-Landroid/content/IntentSender;->mTarget:Landroid/content/IIntentSender;
-Landroid/content/RestrictionsManager;->mService:Landroid/content/IRestrictionsManager;
-Landroid/content/SearchRecentSuggestionsProvider;->mSuggestionProjection:[Ljava/lang/String;
-Landroid/content/SyncAdapterType;->allowParallelSyncs:Z
-Landroid/content/SyncAdapterType;->isAlwaysSyncable:Z
-Landroid/content/SyncAdapterType;->settingsActivity:Ljava/lang/String;
-Landroid/content/SyncContext;->setStatusText(Ljava/lang/String;)V
-Landroid/content/SyncInfo;-><init>(ILandroid/accounts/Account;Ljava/lang/String;J)V
-Landroid/content/SyncRequest;->mAccountToSync:Landroid/accounts/Account;
-Landroid/content/SyncRequest;->mAuthority:Ljava/lang/String;
-Landroid/content/SyncRequest;->mExtras:Landroid/os/Bundle;
-Landroid/content/SyncRequest;->mIsPeriodic:Z
-Landroid/content/SyncRequest;->mSyncRunTimeSecs:J
-Landroid/content/SyncStatusInfo;-><init>(Landroid/os/Parcel;)V
-Landroid/content/SyncStatusInfo;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/content/SyncStatusInfo;->authorityId:I
-Landroid/content/SyncStatusInfo;->ensurePeriodicSyncTimeSize(I)V
-Landroid/content/SyncStatusInfo;->initialFailureTime:J
-Landroid/content/SyncStatusInfo;->initialize:Z
-Landroid/content/SyncStatusInfo;->lastFailureMesg:Ljava/lang/String;
-Landroid/content/SyncStatusInfo;->lastFailureSource:I
-Landroid/content/SyncStatusInfo;->lastFailureTime:J
-Landroid/content/SyncStatusInfo;->lastSuccessSource:I
-Landroid/content/SyncStatusInfo;->lastSuccessTime:J
-Landroid/content/SyncStatusInfo;->pending:Z
-Landroid/content/SyncStatusInfo;->periodicSyncTimes:Ljava/util/ArrayList;
-Landroid/content/UriMatcher;->mChildren:Ljava/util/ArrayList;
-Landroid/content/UriMatcher;->mText:Ljava/lang/String;
-Landroid/content/pm/ActivityInfo;->isResizeableMode(I)Z
-Landroid/content/pm/ActivityInfo;->resizeMode:I
-Landroid/content/pm/ActivityInfo;->supportsPictureInPicture()Z
-Landroid/content/pm/ApplicationInfo;->enabledSetting:I
-Landroid/content/pm/ApplicationInfo;->getBaseResourcePath()Ljava/lang/String;
-Landroid/content/pm/ApplicationInfo;->installLocation:I
-Landroid/content/pm/ApplicationInfo;->isForwardLocked()Z
-Landroid/content/pm/ApplicationInfo;->primaryCpuAbi:Ljava/lang/String;
-Landroid/content/pm/ApplicationInfo;->privateFlags:I
-Landroid/content/pm/ApplicationInfo;->scanPublicSourceDir:Ljava/lang/String;
-Landroid/content/pm/ApplicationInfo;->scanSourceDir:Ljava/lang/String;
-Landroid/content/pm/ApplicationInfo;->secondaryCpuAbi:Ljava/lang/String;
-Landroid/content/pm/ApplicationInfo;->secondaryNativeLibraryDir:Ljava/lang/String;
-Landroid/content/pm/ApplicationInfo;->versionCode:I
-Landroid/content/pm/ApplicationInfo;->volumeUuid:Ljava/lang/String;
-Landroid/content/pm/ComponentInfo;->encryptionAware:Z
-Landroid/content/pm/ComponentInfo;->getComponentName()Landroid/content/ComponentName;
-Landroid/content/pm/IPackageDataObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/pm/IPackageDataObserver$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/pm/IPackageDataObserver$Stub;-><init>()V
-Landroid/content/pm/IPackageDataObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageDataObserver;
-Landroid/content/pm/IPackageDataObserver;->onRemoveCompleted(Ljava/lang/String;Z)V
-Landroid/content/pm/IPackageDeleteObserver$Stub;-><init>()V
-Landroid/content/pm/IPackageDeleteObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageDeleteObserver;
-Landroid/content/pm/IPackageDeleteObserver2$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/pm/IPackageDeleteObserver2$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/pm/IPackageDeleteObserver2;->onPackageDeleted(Ljava/lang/String;ILjava/lang/String;)V
-Landroid/content/pm/IPackageDeleteObserver;->packageDeleted(Ljava/lang/String;I)V
-Landroid/content/pm/IPackageInstallObserver2$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/pm/IPackageInstallObserver2$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/pm/IPackageInstallObserver2$Stub;-><init>()V
-Landroid/content/pm/IPackageInstallObserver2;->onPackageInstalled(Ljava/lang/String;ILjava/lang/String;Landroid/os/Bundle;)V
-Landroid/content/pm/IPackageInstallerCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/pm/IPackageInstallerCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/pm/IPackageInstallerCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageInstallerCallback;
-Landroid/content/pm/IPackageInstallerCallback;->onSessionActiveChanged(IZ)V
-Landroid/content/pm/IPackageInstallerCallback;->onSessionBadgingChanged(I)V
-Landroid/content/pm/IPackageInstallerCallback;->onSessionCreated(I)V
-Landroid/content/pm/IPackageInstallerCallback;->onSessionFinished(IZ)V
-Landroid/content/pm/IPackageInstallerCallback;->onSessionProgressChanged(IF)V
-Landroid/content/pm/IPackageInstallerSession$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/pm/IPackageInstallerSession$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/pm/IPackageInstallerSession$Stub;-><init>()V
-Landroid/content/pm/IPackageInstallerSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageInstallerSession;
-Landroid/content/pm/IPackageManager$Stub$Proxy;->getInstalledPackages(II)Landroid/content/pm/ParceledListSlice;
-Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo;
-Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackagesForUid(I)[Ljava/lang/String;
-Landroid/content/pm/IPackageManager$Stub$Proxy;->getSystemSharedLibraryNames()[Ljava/lang/String;
-Landroid/content/pm/IPackageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageManager;
-Landroid/content/pm/IPackageManager;->addPermission(Landroid/content/pm/PermissionInfo;)Z
-Landroid/content/pm/IPackageManager;->addPermissionAsync(Landroid/content/pm/PermissionInfo;)Z
-Landroid/content/pm/IPackageManager;->getActivityInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ActivityInfo;
-Landroid/content/pm/IPackageManager;->getApplicationInfo(Ljava/lang/String;II)Landroid/content/pm/ApplicationInfo;
-Landroid/content/pm/IPackageManager;->getComponentEnabledSetting(Landroid/content/ComponentName;I)I
-Landroid/content/pm/IPackageManager;->getHomeActivities(Ljava/util/List;)Landroid/content/ComponentName;
-Landroid/content/pm/IPackageManager;->getInstallLocation()I
-Landroid/content/pm/IPackageManager;->getInstalledPackages(II)Landroid/content/pm/ParceledListSlice;
-Landroid/content/pm/IPackageManager;->getInstallerPackageName(Ljava/lang/String;)Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->getLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;I)Landroid/content/pm/ResolveInfo;
-Landroid/content/pm/IPackageManager;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo;
-Landroid/content/pm/IPackageManager;->getProviderInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ProviderInfo;
-Landroid/content/pm/IPackageManager;->getReceiverInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ActivityInfo;
-Landroid/content/pm/IPackageManager;->getServiceInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ServiceInfo;
-Landroid/content/pm/IPackageManager;->setApplicationEnabledSetting(Ljava/lang/String;IIILjava/lang/String;)V
-Landroid/content/pm/IPackageManager;->setComponentEnabledSetting(Landroid/content/ComponentName;III)V
-Landroid/content/pm/IPackageManager;->setInstallerPackageName(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/content/pm/IPackageManager;->setLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;ILandroid/content/IntentFilter;ILandroid/content/ComponentName;)V
-Landroid/content/pm/IPackageMoveObserver$Stub;-><init>()V
-Landroid/content/pm/IPackageMoveObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageMoveObserver;
-Landroid/content/pm/IPackageStatsObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/pm/IPackageStatsObserver$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/content/pm/IPackageStatsObserver$Stub;-><init>()V
-Landroid/content/pm/IPackageStatsObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageStatsObserver;
-Landroid/content/pm/IPackageStatsObserver;->onGetStatsCompleted(Landroid/content/pm/PackageStats;Z)V
-Landroid/content/pm/IShortcutService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/content/pm/IShortcutService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IShortcutService;
-Landroid/content/pm/LauncherActivityInfo;->mActivityInfo:Landroid/content/pm/ActivityInfo;
-Landroid/content/pm/LauncherApps;->mPm:Landroid/content/pm/PackageManager;
-Landroid/content/pm/LauncherApps;->startShortcut(Ljava/lang/String;Ljava/lang/String;Landroid/graphics/Rect;Landroid/os/Bundle;I)V
-Landroid/content/pm/PackageInfo;->INSTALL_LOCATION_UNSPECIFIED:I
-Landroid/content/pm/PackageInfo;->REQUESTED_PERMISSION_REQUIRED:I
-Landroid/content/pm/PackageInstaller$SessionInfo;-><init>()V
-Landroid/content/pm/PackageInstaller$SessionInfo;->active:Z
-Landroid/content/pm/PackageInstaller$SessionInfo;->appIcon:Landroid/graphics/Bitmap;
-Landroid/content/pm/PackageInstaller$SessionInfo;->appLabel:Ljava/lang/CharSequence;
-Landroid/content/pm/PackageInstaller$SessionInfo;->appPackageName:Ljava/lang/String;
-Landroid/content/pm/PackageInstaller$SessionInfo;->installerPackageName:Ljava/lang/String;
-Landroid/content/pm/PackageInstaller$SessionInfo;->mode:I
-Landroid/content/pm/PackageInstaller$SessionInfo;->progress:F
-Landroid/content/pm/PackageInstaller$SessionInfo;->resolvedBaseCodePath:Ljava/lang/String;
-Landroid/content/pm/PackageInstaller$SessionInfo;->sealed:Z
-Landroid/content/pm/PackageInstaller$SessionInfo;->sessionId:I
-Landroid/content/pm/PackageInstaller$SessionInfo;->sizeBytes:J
-Landroid/content/pm/PackageInstaller$SessionParams;->appIcon:Landroid/graphics/Bitmap;
-Landroid/content/pm/PackageInstaller$SessionParams;->appLabel:Ljava/lang/String;
-Landroid/content/pm/PackageInstaller$SessionParams;->appPackageName:Ljava/lang/String;
-Landroid/content/pm/PackageInstaller$SessionParams;->installFlags:I
-Landroid/content/pm/PackageInstaller$SessionParams;->mode:I
-Landroid/content/pm/PackageInstaller$SessionParams;->sizeBytes:J
-Landroid/content/pm/PackageItemInfo;->setForceSafeLabels(Z)V
-Landroid/content/pm/PackageManager;->NO_NATIVE_LIBRARIES:I
-Landroid/content/pm/PackageManager;->buildRequestPermissionsIntent([Ljava/lang/String;)Landroid/content/Intent;
-Landroid/content/pm/PackageManager;->freeStorage(JLandroid/content/IntentSender;)V
-Landroid/content/pm/PackageManager;->freeStorage(Ljava/lang/String;JLandroid/content/IntentSender;)V
-Landroid/content/pm/PackageManager;->freeStorageAndNotify(JLandroid/content/pm/IPackageDataObserver;)V
-Landroid/content/pm/PackageManager;->freeStorageAndNotify(Ljava/lang/String;JLandroid/content/pm/IPackageDataObserver;)V
-Landroid/content/pm/PackageManager;->getApplicationInfoAsUser(Ljava/lang/String;II)Landroid/content/pm/ApplicationInfo;
-Landroid/content/pm/PackageManager;->getHomeActivities(Ljava/util/List;)Landroid/content/ComponentName;
-Landroid/content/pm/PackageManager;->getPackageCandidateVolumes(Landroid/content/pm/ApplicationInfo;)Ljava/util/List;
-Landroid/content/pm/PackageManager;->getPackageInfoAsUser(Ljava/lang/String;II)Landroid/content/pm/PackageInfo;
-Landroid/content/pm/PackageManager;->getPackageSizeInfo(Ljava/lang/String;Landroid/content/pm/IPackageStatsObserver;)V
-Landroid/content/pm/PackageManager;->getResourcesForApplicationAsUser(Ljava/lang/String;I)Landroid/content/res/Resources;
-Landroid/content/pm/PackageManager;->movePackage(Ljava/lang/String;Landroid/os/storage/VolumeInfo;)I
-Landroid/content/pm/PackageManager;->queryBroadcastReceivers(Landroid/content/Intent;II)Ljava/util/List;
-Landroid/content/pm/PackageManager;->setInstantAppCookie([B)Z
-Landroid/content/pm/PackageParser$Activity;->info:Landroid/content/pm/ActivityInfo;
-Landroid/content/pm/PackageParser$ActivityIntentInfo;->activity:Landroid/content/pm/PackageParser$Activity;
-Landroid/content/pm/PackageParser$Component;->className:Ljava/lang/String;
-Landroid/content/pm/PackageParser$Component;->getComponentName()Landroid/content/ComponentName;
-Landroid/content/pm/PackageParser$Component;->intents:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Component;->metaData:Landroid/os/Bundle;
-Landroid/content/pm/PackageParser$Instrumentation;->info:Landroid/content/pm/InstrumentationInfo;
-Landroid/content/pm/PackageParser$IntentInfo;-><init>()V
-Landroid/content/pm/PackageParser$IntentInfo;->banner:I
-Landroid/content/pm/PackageParser$IntentInfo;->hasDefault:Z
-Landroid/content/pm/PackageParser$IntentInfo;->icon:I
-Landroid/content/pm/PackageParser$IntentInfo;->labelRes:I
-Landroid/content/pm/PackageParser$IntentInfo;->logo:I
-Landroid/content/pm/PackageParser$IntentInfo;->nonLocalizedLabel:Ljava/lang/CharSequence;
-Landroid/content/pm/PackageParser$Package;->activities:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->applicationInfo:Landroid/content/pm/ApplicationInfo;
-Landroid/content/pm/PackageParser$Package;->configPreferences:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->instrumentation:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->mAppMetaData:Landroid/os/Bundle;
-Landroid/content/pm/PackageParser$Package;->mKeySetMapping:Landroid/util/ArrayMap;
-Landroid/content/pm/PackageParser$Package;->mPreferredOrder:I
-Landroid/content/pm/PackageParser$Package;->mSharedUserId:Ljava/lang/String;
-Landroid/content/pm/PackageParser$Package;->mSharedUserLabel:I
-Landroid/content/pm/PackageParser$Package;->mVersionCode:I
-Landroid/content/pm/PackageParser$Package;->mVersionName:Ljava/lang/String;
-Landroid/content/pm/PackageParser$Package;->packageName:Ljava/lang/String;
-Landroid/content/pm/PackageParser$Package;->permissionGroups:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->permissions:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->providers:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->receivers:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->reqFeatures:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->requestedPermissions:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->services:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->usesLibraries:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Package;->usesOptionalLibraries:Ljava/util/ArrayList;
-Landroid/content/pm/PackageParser$Provider;->info:Landroid/content/pm/ProviderInfo;
-Landroid/content/pm/PackageParser$ProviderIntentInfo;->provider:Landroid/content/pm/PackageParser$Provider;
-Landroid/content/pm/PackageParser$Service;->info:Landroid/content/pm/ServiceInfo;
-Landroid/content/pm/PackageParser$ServiceIntentInfo;->service:Landroid/content/pm/PackageParser$Service;
-Landroid/content/pm/PackageParser;-><init>()V
-Landroid/content/pm/PackageParser;->collectCertificates(Landroid/content/pm/PackageParser$Package;Ljava/io/File;Z)V
-Landroid/content/pm/PackageParser;->collectCertificates(Landroid/content/pm/PackageParser$Package;Z)V
-Landroid/content/pm/PackageParser;->generateActivityInfo(Landroid/content/pm/PackageParser$Activity;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ActivityInfo;
-Landroid/content/pm/PackageParser;->generateApplicationInfo(Landroid/content/pm/PackageParser$Package;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ApplicationInfo;
-Landroid/content/pm/PackageParser;->generateInstrumentationInfo(Landroid/content/pm/PackageParser$Instrumentation;I)Landroid/content/pm/InstrumentationInfo;
-Landroid/content/pm/PackageParser;->generatePackageInfo(Landroid/content/pm/PackageParser$Package;[IIJJLjava/util/Set;Landroid/content/pm/PackageUserState;)Landroid/content/pm/PackageInfo;
-Landroid/content/pm/PackageParser;->generatePackageInfo(Landroid/content/pm/PackageParser$Package;[IIJJLjava/util/Set;Landroid/content/pm/PackageUserState;I)Landroid/content/pm/PackageInfo;
-Landroid/content/pm/PackageParser;->generatePermissionGroupInfo(Landroid/content/pm/PackageParser$PermissionGroup;I)Landroid/content/pm/PermissionGroupInfo;
-Landroid/content/pm/PackageParser;->generatePermissionInfo(Landroid/content/pm/PackageParser$Permission;I)Landroid/content/pm/PermissionInfo;
-Landroid/content/pm/PackageParser;->generateProviderInfo(Landroid/content/pm/PackageParser$Provider;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ProviderInfo;
-Landroid/content/pm/PackageParser;->generateServiceInfo(Landroid/content/pm/PackageParser$Service;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ServiceInfo;
-Landroid/content/pm/PackageParser;->parseBaseApk(Ljava/lang/String;Landroid/content/res/Resources;Landroid/content/res/XmlResourceParser;I[Ljava/lang/String;)Landroid/content/pm/PackageParser$Package;
-Landroid/content/pm/PackageParser;->parseMonolithicPackage(Ljava/io/File;I)Landroid/content/pm/PackageParser$Package;
-Landroid/content/pm/PackageParser;->parsePackage(Ljava/io/File;I)Landroid/content/pm/PackageParser$Package;
-Landroid/content/pm/PackageParser;->parsePackage(Ljava/io/File;IZ)Landroid/content/pm/PackageParser$Package;
-Landroid/content/pm/PackageUserState;-><init>()V
-Landroid/content/pm/ParceledListSlice;-><init>(Ljava/util/List;)V
-Landroid/content/pm/ResolveInfo;->instantAppAvailable:Z
-Landroid/content/pm/SharedLibraryInfo;->isBuiltin()Z
-Landroid/content/pm/SharedLibraryInfo;->isDynamic()Z
-Landroid/content/pm/SharedLibraryInfo;->isStatic()Z
-Landroid/content/pm/ShortcutManager;->mService:Landroid/content/pm/IShortcutService;
-Landroid/content/pm/Signature;->getPublicKey()Ljava/security/PublicKey;
-Landroid/content/pm/UserInfo;-><init>(ILjava/lang/String;I)V
-Landroid/content/pm/UserInfo;->FLAG_PRIMARY:I
-Landroid/content/pm/UserInfo;->id:I
-Landroid/content/pm/UserInfo;->isPrimary()Z
-Landroid/content/pm/UserInfo;->serialNumber:I
-Landroid/content/res/AssetFileDescriptor;->mFd:Landroid/os/ParcelFileDescriptor;
-Landroid/content/res/AssetFileDescriptor;->mLength:J
-Landroid/content/res/AssetFileDescriptor;->mStartOffset:J
-Landroid/content/res/AssetManager;-><init>()V
-Landroid/content/res/AssetManager;->addAssetPath(Ljava/lang/String;)I
-Landroid/content/res/AssetManager;->addAssetPathAsSharedLibrary(Ljava/lang/String;)I
-Landroid/content/res/AssetManager;->applyStyle(JIILandroid/content/res/XmlBlock$Parser;[IJJ)V
-Landroid/content/res/AssetManager;->createTheme()J
-Landroid/content/res/AssetManager;->getAssignedPackageIdentifiers()Landroid/util/SparseArray;
-Landroid/content/res/AssetManager;->getResourceBagText(II)Ljava/lang/CharSequence;
-Landroid/content/res/AssetManager;->getResourceEntryName(I)Ljava/lang/String;
-Landroid/content/res/AssetManager;->getResourceIdentifier(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
-Landroid/content/res/AssetManager;->getResourceName(I)Ljava/lang/String;
-Landroid/content/res/AssetManager;->getResourcePackageName(I)Ljava/lang/String;
-Landroid/content/res/AssetManager;->getResourceTypeName(I)Ljava/lang/String;
-Landroid/content/res/AssetManager;->isUpToDate()Z
-Landroid/content/res/AssetManager;->mObject:J
-Landroid/content/res/AssetManager;->openNonAsset(ILjava/lang/String;)Ljava/io/InputStream;
-Landroid/content/res/AssetManager;->openNonAsset(ILjava/lang/String;I)Ljava/io/InputStream;
-Landroid/content/res/AssetManager;->openNonAsset(Ljava/lang/String;)Ljava/io/InputStream;
-Landroid/content/res/AssetManager;->openNonAsset(Ljava/lang/String;I)Ljava/io/InputStream;
-Landroid/content/res/AssetManager;->resolveAttrs(JII[I[I[I[I)Z
-Landroid/content/res/AssetManager;->retrieveAttributes(Landroid/content/res/XmlBlock$Parser;[I[I[I)Z
-Landroid/content/res/AssetManager;->setConfiguration(IILjava/lang/String;IIIIIIIIIIIIIII)V
-Landroid/content/res/ColorStateList$ColorStateListFactory;-><init>(Landroid/content/res/ColorStateList;)V
-Landroid/content/res/ColorStateList;->getColors()[I
-Landroid/content/res/ColorStateList;->mColors:[I
-Landroid/content/res/ColorStateList;->mDefaultColor:I
-Landroid/content/res/ColorStateList;->mFactory:Landroid/content/res/ColorStateList$ColorStateListFactory;
-Landroid/content/res/ColorStateList;->mStateSpecs:[[I
-Landroid/content/res/ColorStateList;->onColorsChanged()V
-Landroid/content/res/CompatibilityInfo;-><init>(Landroid/content/pm/ApplicationInfo;IIZ)V
-Landroid/content/res/CompatibilityInfo;->DEFAULT_COMPATIBILITY_INFO:Landroid/content/res/CompatibilityInfo;
-Landroid/content/res/CompatibilityInfo;->applicationScale:F
-Landroid/content/res/DrawableCache;-><init>()V
-Landroid/content/res/DrawableCache;->getInstance(JLandroid/content/res/Resources;Landroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
-Landroid/content/res/ObbInfo;->salt:[B
-Landroid/content/res/Resources;->getCompatibilityInfo()Landroid/content/res/CompatibilityInfo;
-Landroid/content/res/Resources;->loadXmlResourceParser(ILjava/lang/String;)Landroid/content/res/XmlResourceParser;
-Landroid/content/res/Resources;->loadXmlResourceParser(Ljava/lang/String;IILjava/lang/String;)Landroid/content/res/XmlResourceParser;
-Landroid/content/res/Resources;->mClassLoader:Ljava/lang/ClassLoader;
-Landroid/content/res/Resources;->mDrawableInflater:Landroid/graphics/drawable/DrawableInflater;
-Landroid/content/res/Resources;->mResourcesImpl:Landroid/content/res/ResourcesImpl;
-Landroid/content/res/Resources;->mSystem:Landroid/content/res/Resources;
-Landroid/content/res/Resources;->mTmpValue:Landroid/util/TypedValue;
-Landroid/content/res/Resources;->mTypedArrayPool:Landroid/util/Pools$SynchronizedPool;
-Landroid/content/res/Resources;->selectDefaultTheme(II)I
-Landroid/content/res/Resources;->setCompatibilityInfo(Landroid/content/res/CompatibilityInfo;)V
-Landroid/content/res/Resources;->updateSystemConfiguration(Landroid/content/res/Configuration;Landroid/util/DisplayMetrics;Landroid/content/res/CompatibilityInfo;)V
-Landroid/content/res/ResourcesImpl;->TRACE_FOR_MISS_PRELOAD:Z
-Landroid/content/res/ResourcesImpl;->TRACE_FOR_PRELOAD:Z
-Landroid/content/res/ResourcesImpl;->getAssets()Landroid/content/res/AssetManager;
-Landroid/content/res/ResourcesImpl;->getValue(ILandroid/util/TypedValue;Z)V
-Landroid/content/res/ResourcesImpl;->mAccessLock:Ljava/lang/Object;
-Landroid/content/res/ResourcesImpl;->mAnimatorCache:Landroid/content/res/ConfigurationBoundResourceCache;
-Landroid/content/res/ResourcesImpl;->mAssets:Landroid/content/res/AssetManager;
-Landroid/content/res/ResourcesImpl;->mColorDrawableCache:Landroid/content/res/DrawableCache;
-Landroid/content/res/ResourcesImpl;->mConfiguration:Landroid/content/res/Configuration;
-Landroid/content/res/ResourcesImpl;->mDrawableCache:Landroid/content/res/DrawableCache;
-Landroid/content/res/ResourcesImpl;->mPreloading:Z
-Landroid/content/res/ResourcesImpl;->mStateListAnimatorCache:Landroid/content/res/ConfigurationBoundResourceCache;
-Landroid/content/res/ResourcesImpl;->sPreloadedColorDrawables:Landroid/util/LongSparseArray;
-Landroid/content/res/ResourcesImpl;->sPreloadedComplexColors:Landroid/util/LongSparseArray;
-Landroid/content/res/ResourcesImpl;->sPreloadedDrawables:[Landroid/util/LongSparseArray;
-Landroid/content/res/ResourcesKey;->mSplitResDirs:[Ljava/lang/String;
-Landroid/content/res/StringBlock;-><init>(JZ)V
-Landroid/content/res/ThemedResourceCache;->onConfigurationChange(I)V
-Landroid/content/res/TypedArray;->extractThemeAttrs()[I
-Landroid/content/res/TypedArray;->getNonConfigurationString(II)Ljava/lang/String;
-Landroid/content/res/TypedArray;->getValueAt(ILandroid/util/TypedValue;)Z
-Landroid/content/res/TypedArray;->mAssets:Landroid/content/res/AssetManager;
-Landroid/content/res/TypedArray;->mData:[I
-Landroid/content/res/TypedArray;->mIndices:[I
-Landroid/content/res/TypedArray;->mLength:I
-Landroid/content/res/TypedArray;->mMetrics:Landroid/util/DisplayMetrics;
-Landroid/content/res/TypedArray;->mRecycled:Z
-Landroid/content/res/TypedArray;->mResources:Landroid/content/res/Resources;
-Landroid/content/res/TypedArray;->mTheme:Landroid/content/res/Resources$Theme;
-Landroid/content/res/TypedArray;->mValue:Landroid/util/TypedValue;
-Landroid/content/res/TypedArray;->mXml:Landroid/content/res/XmlBlock$Parser;
-Landroid/content/res/XmlBlock$Parser;->mBlock:Landroid/content/res/XmlBlock;
-Landroid/content/res/XmlBlock$Parser;->mParseState:J
-Landroid/content/res/XmlBlock;-><init>([B)V
-Landroid/content/res/XmlBlock;->newParser()Landroid/content/res/XmlResourceParser;
-Landroid/database/AbstractCursor;->mCurrentRowID:Ljava/lang/Long;
-Landroid/database/AbstractCursor;->mExtras:Landroid/os/Bundle;
-Landroid/database/AbstractCursor;->mNotifyUri:Landroid/net/Uri;
-Landroid/database/AbstractCursor;->mRowIdColumnIndex:I
-Landroid/database/AbstractCursor;->mUpdatedRows:Ljava/util/HashMap;
-Landroid/database/AbstractWindowedCursor;->clearOrCreateWindow(Ljava/lang/String;)V
-Landroid/database/CursorWindow;->mWindowPtr:J
-Landroid/database/CursorWindow;->sCursorWindowSize:I
-Landroid/database/CursorWindow;->sWindowToPidMap:Landroid/util/LongSparseArray;
-Landroid/database/CursorWrapper;->mCursor:Landroid/database/Cursor;
-Landroid/database/sqlite/SQLiteCustomFunction;->dispatchCallback([Ljava/lang/String;)V
-Landroid/database/sqlite/SQLiteCustomFunction;->name:Ljava/lang/String;
-Landroid/database/sqlite/SQLiteCustomFunction;->numArgs:I
-Landroid/database/sqlite/SQLiteDatabase;->CONFLICT_VALUES:[Ljava/lang/String;
-Landroid/database/sqlite/SQLiteDatabase;->mConfigurationLocked:Landroid/database/sqlite/SQLiteDatabaseConfiguration;
-Landroid/database/sqlite/SQLiteDatabase;->mConnectionPoolLocked:Landroid/database/sqlite/SQLiteConnectionPool;
-Landroid/database/sqlite/SQLiteDatabase;->reopenReadWrite()V
-Landroid/database/sqlite/SQLiteDatabaseConfiguration;->maxSqlCacheSize:I
-Landroid/database/sqlite/SQLiteDebug$PagerStats;->largestMemAlloc:I
-Landroid/database/sqlite/SQLiteDebug$PagerStats;->memoryUsed:I
-Landroid/database/sqlite/SQLiteDebug$PagerStats;->pageCacheOverflow:I
-Landroid/database/sqlite/SQLiteOpenHelper;->mName:Ljava/lang/String;
-Landroid/database/sqlite/SQLiteStatement;-><init>(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V
-Landroid/database/sqlite/SqliteWrapper;->insert(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;
-Landroid/database/sqlite/SqliteWrapper;->query(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
-Landroid/ddm/DdmHandleAppName;->getAppName()Ljava/lang/String;
-Landroid/ddm/DdmHandleAppName;->setAppName(Ljava/lang/String;I)V
-Landroid/graphics/AvoidXfermode$Mode;
-Landroid/graphics/AvoidXfermode$Mode;->AVOID:Landroid/graphics/AvoidXfermode$Mode;
-Landroid/graphics/AvoidXfermode$Mode;->TARGET:Landroid/graphics/AvoidXfermode$Mode;
-Landroid/graphics/AvoidXfermode$Mode;->valueOf(Ljava/lang/String;)Landroid/graphics/AvoidXfermode$Mode;
-Landroid/graphics/AvoidXfermode$Mode;->values()[Landroid/graphics/AvoidXfermode$Mode;
-Landroid/graphics/AvoidXfermode;
-Landroid/graphics/AvoidXfermode;-><init>(IILandroid/graphics/AvoidXfermode$Mode;)V
-Landroid/graphics/BaseCanvas;->mNativeCanvasWrapper:J
-Landroid/graphics/Bitmap$Config;->nativeInt:I
-Landroid/graphics/Bitmap$Config;->nativeToConfig(I)Landroid/graphics/Bitmap$Config;
-Landroid/graphics/Bitmap;-><init>(JIIIZZ[BLandroid/graphics/NinePatch$InsetStruct;)V
-Landroid/graphics/Bitmap;->createAshmemBitmap()Landroid/graphics/Bitmap;
-Landroid/graphics/Bitmap;->createAshmemBitmap(Landroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
-Landroid/graphics/Bitmap;->createGraphicBufferHandle()Landroid/graphics/GraphicBuffer;
-Landroid/graphics/Bitmap;->createHardwareBitmap(Landroid/graphics/GraphicBuffer;)Landroid/graphics/Bitmap;
-Landroid/graphics/Bitmap;->getDefaultDensity()I
-Landroid/graphics/Bitmap;->mNativePtr:J
-Landroid/graphics/Bitmap;->mNinePatchChunk:[B
-Landroid/graphics/Bitmap;->mNinePatchInsets:Landroid/graphics/NinePatch$InsetStruct;
-Landroid/graphics/Bitmap;->reinit(IIZ)V
-Landroid/graphics/Bitmap;->setDefaultDensity(I)V
-Landroid/graphics/BitmapFactory;->nativeDecodeAsset(JLandroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
-Landroid/graphics/BitmapFactory;->nativeDecodeByteArray([BIILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
-Landroid/graphics/BitmapFactory;->nativeDecodeFileDescriptor(Ljava/io/FileDescriptor;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
-Landroid/graphics/BitmapFactory;->nativeDecodeStream(Ljava/io/InputStream;[BLandroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
-Landroid/graphics/BitmapRegionDecoder;-><init>(J)V
-Landroid/graphics/Camera;->native_instance:J
-Landroid/graphics/Canvas;-><init>(J)V
-Landroid/graphics/Canvas;->CLIP_SAVE_FLAG:I
-Landroid/graphics/Canvas;->CLIP_TO_LAYER_SAVE_FLAG:I
-Landroid/graphics/Canvas;->FULL_COLOR_LAYER_SAVE_FLAG:I
-Landroid/graphics/Canvas;->HAS_ALPHA_LAYER_SAVE_FLAG:I
-Landroid/graphics/Canvas;->MATRIX_SAVE_FLAG:I
-Landroid/graphics/Canvas;->clipRegion(Landroid/graphics/Region;)Z
-Landroid/graphics/Canvas;->clipRegion(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z
-Landroid/graphics/Canvas;->release()V
-Landroid/graphics/Canvas;->save(I)I
-Landroid/graphics/ColorMatrixColorFilter;->setColorMatrix(Landroid/graphics/ColorMatrix;)V
-Landroid/graphics/FontFamily;-><init>()V
-Landroid/graphics/FontFamily;->abortCreation()V
-Landroid/graphics/FontFamily;->addFontFromAssetManager(Landroid/content/res/AssetManager;Ljava/lang/String;IZIII[Landroid/graphics/fonts/FontVariationAxis;)Z
-Landroid/graphics/FontFamily;->addFontFromBuffer(Ljava/nio/ByteBuffer;I[Landroid/graphics/fonts/FontVariationAxis;II)Z
-Landroid/graphics/FontFamily;->freeze()Z
-Landroid/graphics/GraphicBuffer;-><init>(IIIIJ)V
-Landroid/graphics/GraphicBuffer;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/graphics/GraphicBuffer;->createFromExisting(IIIIJ)Landroid/graphics/GraphicBuffer;
-Landroid/graphics/GraphicBuffer;->mNativeObject:J
-Landroid/graphics/ImageDecoder$IncompleteException;
-Landroid/graphics/ImageDecoder$IncompleteException;-><init>()V
-Landroid/graphics/ImageDecoder;->ERROR_SOURCE_ERROR:I
-Landroid/graphics/ImageDecoder;->ERROR_SOURCE_EXCEPTION:I
-Landroid/graphics/ImageDecoder;->ERROR_SOURCE_INCOMPLETE:I
-Landroid/graphics/ImageDecoder;->getAsAlphaMask()Z
-Landroid/graphics/ImageDecoder;->getConserveMemory()Z
-Landroid/graphics/ImageDecoder;->getDecodeAsAlphaMask()Z
-Landroid/graphics/ImageDecoder;->getMutable()Z
-Landroid/graphics/ImageDecoder;->getRequireUnpremultiplied()Z
-Landroid/graphics/ImageDecoder;->postProcessAndRelease(Landroid/graphics/Canvas;)I
-Landroid/graphics/ImageDecoder;->setAsAlphaMask(Z)Landroid/graphics/ImageDecoder;
-Landroid/graphics/ImageDecoder;->setConserveMemory(Z)V
-Landroid/graphics/ImageDecoder;->setDecodeAsAlphaMask(Z)Landroid/graphics/ImageDecoder;
-Landroid/graphics/ImageDecoder;->setMutable(Z)Landroid/graphics/ImageDecoder;
-Landroid/graphics/ImageDecoder;->setRequireUnpremultiplied(Z)Landroid/graphics/ImageDecoder;
-Landroid/graphics/ImageDecoder;->setResize(I)Landroid/graphics/ImageDecoder;
-Landroid/graphics/ImageDecoder;->setResize(II)Landroid/graphics/ImageDecoder;
-Landroid/graphics/Insets;->left:I
-Landroid/graphics/Insets;->right:I
-Landroid/graphics/LayerRasterizer;
-Landroid/graphics/LayerRasterizer;-><init>()V
-Landroid/graphics/LayerRasterizer;->addLayer(Landroid/graphics/Paint;)V
-Landroid/graphics/LayerRasterizer;->addLayer(Landroid/graphics/Paint;FF)V
-Landroid/graphics/LinearGradient;->mColors:[I
-Landroid/graphics/Matrix;->native_instance:J
-Landroid/graphics/Movie;-><init>(J)V
-Landroid/graphics/Movie;->mNativeMovie:J
-Landroid/graphics/NinePatch$InsetStruct;-><init>(IIIIIIIIFIF)V
-Landroid/graphics/NinePatch;->mBitmap:Landroid/graphics/Bitmap;
-Landroid/graphics/Paint;->getRasterizer()Landroid/graphics/Rasterizer;
-Landroid/graphics/Paint;->setRasterizer(Landroid/graphics/Rasterizer;)Landroid/graphics/Rasterizer;
-Landroid/graphics/Picture;->mNativePicture:J
-Landroid/graphics/PixelXorXfermode;
-Landroid/graphics/PixelXorXfermode;-><init>(I)V
-Landroid/graphics/PorterDuffColorFilter;->getColor()I
-Landroid/graphics/PorterDuffColorFilter;->setColor(I)V
-Landroid/graphics/PorterDuffColorFilter;->setMode(Landroid/graphics/PorterDuff$Mode;)V
-Landroid/graphics/Rasterizer;
-Landroid/graphics/Rasterizer;-><init>()V
-Landroid/graphics/Rect;->scale(F)V
-Landroid/graphics/Region;-><init>(JI)V
-Landroid/graphics/Region;->mNativeRegion:J
-Landroid/graphics/SurfaceTexture;->mFrameAvailableListener:J
-Landroid/graphics/SurfaceTexture;->mProducer:J
-Landroid/graphics/SurfaceTexture;->mSurfaceTexture:J
-Landroid/graphics/SurfaceTexture;->nativeDetachFromGLContext()I
-Landroid/graphics/SurfaceTexture;->postEventFromNative(Ljava/lang/ref/WeakReference;)V
-Landroid/graphics/Typeface;->createFromFamiliesWithDefault([Landroid/graphics/FontFamily;II)Landroid/graphics/Typeface;
-Landroid/graphics/Typeface;->createFromFamiliesWithDefault([Landroid/graphics/FontFamily;Ljava/lang/String;II)Landroid/graphics/Typeface;
-Landroid/graphics/Typeface;->mStyle:I
-Landroid/graphics/Typeface;->sDefaults:[Landroid/graphics/Typeface;
-Landroid/graphics/Typeface;->sSystemFontMap:Ljava/util/Map;
-Landroid/graphics/Typeface;->setDefault(Landroid/graphics/Typeface;)V
-Landroid/graphics/drawable/AnimatedImageDrawable;->LOOP_INFINITE:I
-Landroid/graphics/drawable/AnimatedImageDrawable;->getLoopCount(I)I
-Landroid/graphics/drawable/AnimatedImageDrawable;->onAnimationEnd()V
-Landroid/graphics/drawable/AnimatedImageDrawable;->setLoopCount(I)V
-Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState;->mStateIds:Landroid/util/SparseIntArray;
-Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState;->mTransitions:Landroid/util/LongSparseLongArray;
-Landroid/graphics/drawable/AnimatedStateListDrawable;->mState:Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState;
-Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT;->callOnFinished(Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT;I)V
-Landroid/graphics/drawable/AnimationDrawable;->mCurFrame:I
-Landroid/graphics/drawable/BitmapDrawable;->getOpticalInsets()Landroid/graphics/Insets;
-Landroid/graphics/drawable/BitmapDrawable;->getTint()Landroid/content/res/ColorStateList;
-Landroid/graphics/drawable/BitmapDrawable;->getTintMode()Landroid/graphics/PorterDuff$Mode;
-Landroid/graphics/drawable/BitmapDrawable;->mTargetDensity:I
-Landroid/graphics/drawable/BitmapDrawable;->setBitmap(Landroid/graphics/Bitmap;)V
-Landroid/graphics/drawable/ColorDrawable$ColorState;->mUseColor:I
-Landroid/graphics/drawable/Drawable;->getOpticalInsets()Landroid/graphics/Insets;
-Landroid/graphics/drawable/Drawable;->inflateWithAttributes(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/TypedArray;I)V
-Landroid/graphics/drawable/Drawable;->isProjected()Z
-Landroid/graphics/drawable/Drawable;->mCallback:Ljava/lang/ref/WeakReference;
-Landroid/graphics/drawable/Drawable;->parseTintMode(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuff$Mode;
-Landroid/graphics/drawable/Drawable;->updateTintFilter(Landroid/graphics/PorterDuffColorFilter;Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter;
-Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantPadding:Landroid/graphics/Rect;
-Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;->mDrawables:[Landroid/graphics/drawable/Drawable;
-Landroid/graphics/drawable/DrawableContainer;->getOpticalInsets()Landroid/graphics/Insets;
-Landroid/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;
-Landroid/graphics/drawable/DrawableInflater;->mClassLoader:Ljava/lang/ClassLoader;
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mAngle:I
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mGradient:I
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mGradientColors:[I
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mHeight:I
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mInnerRadius:I
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mInnerRadiusRatio:F
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mOrientation:Landroid/graphics/drawable/GradientDrawable$Orientation;
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mPadding:Landroid/graphics/Rect;
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mPositions:[F
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mRadius:F
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mRadiusArray:[F
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mShape:I
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mSolidColors:Landroid/content/res/ColorStateList;
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeDashGap:F
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeDashWidth:F
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeWidth:I
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mThickness:I
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mThicknessRatio:F
-Landroid/graphics/drawable/GradientDrawable$GradientState;->mWidth:I
-Landroid/graphics/drawable/GradientDrawable;->getOpticalInsets()Landroid/graphics/Insets;
-Landroid/graphics/drawable/GradientDrawable;->mGradientState:Landroid/graphics/drawable/GradientDrawable$GradientState;
-Landroid/graphics/drawable/GradientDrawable;->mPadding:Landroid/graphics/Rect;
-Landroid/graphics/drawable/Icon;->getBitmap()Landroid/graphics/Bitmap;
-Landroid/graphics/drawable/Icon;->getDataBytes()[B
-Landroid/graphics/drawable/Icon;->getDataLength()I
-Landroid/graphics/drawable/Icon;->getDataOffset()I
-Landroid/graphics/drawable/Icon;->getResources()Landroid/content/res/Resources;
-Landroid/graphics/drawable/Icon;->hasTint()Z
-Landroid/graphics/drawable/Icon;->mString1:Ljava/lang/String;
-Landroid/graphics/drawable/Icon;->mType:I
-Landroid/graphics/drawable/InsetDrawable;->mState:Landroid/graphics/drawable/InsetDrawable$InsetState;
-Landroid/graphics/drawable/LayerDrawable$ChildDrawable;->mDrawable:Landroid/graphics/drawable/Drawable;
-Landroid/graphics/drawable/LayerDrawable$LayerState;->mChildren:[Landroid/graphics/drawable/LayerDrawable$ChildDrawable;
-Landroid/graphics/drawable/LayerDrawable;->mLayerState:Landroid/graphics/drawable/LayerDrawable$LayerState;
-Landroid/graphics/drawable/NinePatchDrawable$NinePatchState;->mNinePatch:Landroid/graphics/NinePatch;
-Landroid/graphics/drawable/NinePatchDrawable;->mNinePatchState:Landroid/graphics/drawable/NinePatchDrawable$NinePatchState;
-Landroid/graphics/drawable/RippleDrawable$RippleState;->mColor:Landroid/content/res/ColorStateList;
-Landroid/graphics/drawable/RippleDrawable;->mState:Landroid/graphics/drawable/RippleDrawable$RippleState;
-Landroid/graphics/drawable/StateListDrawable;->extractStateSet(Landroid/util/AttributeSet;)[I
-Landroid/graphics/drawable/StateListDrawable;->getStateCount()I
-Landroid/graphics/drawable/StateListDrawable;->getStateDrawable(I)Landroid/graphics/drawable/Drawable;
-Landroid/graphics/drawable/StateListDrawable;->getStateDrawableIndex([I)I
-Landroid/graphics/drawable/StateListDrawable;->getStateSet(I)[I
-Landroid/graphics/drawable/StateListDrawable;->mStateListState:Landroid/graphics/drawable/StateListDrawable$StateListState;
-Landroid/graphics/drawable/StateListDrawable;->updateStateFromTypedArray(Landroid/content/res/TypedArray;)V
-Landroid/graphics/drawable/VectorDrawable$VGroup;->setRotation(F)V
-Landroid/graphics/drawable/VectorDrawable;->getTargetByName(Ljava/lang/String;)Ljava/lang/Object;
-Landroid/graphics/drawable/VectorDrawable;->mTintFilter:Landroid/graphics/PorterDuffColorFilter;
-Landroid/graphics/drawable/VectorDrawable;->setAllowCaching(Z)V
-Landroid/graphics/fonts/FontVariationAxis;->mStyleValue:F
-Landroid/graphics/fonts/FontVariationAxis;->mTag:I
-Landroid/hardware/Camera;->addCallbackBuffer([BI)V
-Landroid/hardware/Camera;->mNativeContext:J
-Landroid/hardware/Camera;->native_setup(Ljava/lang/Object;IILjava/lang/String;)I
-Landroid/hardware/Camera;->openLegacy(II)Landroid/hardware/Camera;
-Landroid/hardware/Camera;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V
-Landroid/hardware/HardwareBuffer;-><init>(J)V
-Landroid/hardware/HardwareBuffer;->destroy()V
-Landroid/hardware/HardwareBuffer;->isDestroyed()Z
-Landroid/hardware/HardwareBuffer;->mNativeObject:J
-Landroid/hardware/ICameraService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/ICameraService;
-Landroid/hardware/SensorDirectChannel;->isValid()Z
-Landroid/hardware/SensorManager;->configureDirectChannel(Landroid/hardware/SensorDirectChannel;Landroid/hardware/Sensor;I)I
-Landroid/hardware/SerialPort;->mNativeContext:I
-Landroid/hardware/SystemSensorManager$BaseEventQueue;->dispatchAdditionalInfoEvent(III[F[I)V
-Landroid/hardware/SystemSensorManager$BaseEventQueue;->dispatchFlushCompleteEvent(I)V
-Landroid/hardware/SystemSensorManager$BaseEventQueue;->dispatchSensorEvent(I[FIJ)V
-Landroid/hardware/camera2/CameraAccessException;->serialVersionUID:J
-Landroid/hardware/camera2/CameraCharacteristics$Key;-><init>(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V
-Landroid/hardware/camera2/CameraCharacteristics$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V
-Landroid/hardware/camera2/CameraCharacteristics$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;J)V
-Landroid/hardware/camera2/CameraCharacteristics$Key;->getNativeKey()Landroid/hardware/camera2/impl/CameraMetadataNative$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_MAX_REGIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->LED_AVAILABLE_LEDS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->LENS_INFO_SHADING_MAP_SIZE:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->LOGICAL_MULTI_CAMERA_PHYSICAL_IDS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->QUIRKS_USE_PARTIAL_RESULT:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_CHARACTERISTICS_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_RESULT_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_SESSION_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_MAX_NUM_OUTPUT_STREAMS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_FORMATS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_JPEG_MIN_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_JPEG_SIZES:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_PROCESSED_SIZES:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_STALL_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_STREAM_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
-Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V
-Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V
-Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;J)V
-Landroid/hardware/camera2/CaptureRequest$Key;->getNativeKey()Landroid/hardware/camera2/impl/CameraMetadataNative$Key;
-Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_COORDINATES:Landroid/hardware/camera2/CaptureRequest$Key;
-Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureRequest$Key;
-Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureRequest$Key;
-Landroid/hardware/camera2/CaptureRequest;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureRequest$Key;
-Landroid/hardware/camera2/CaptureRequest;->REQUEST_ID:Landroid/hardware/camera2/CaptureRequest$Key;
-Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_BLUE:Landroid/hardware/camera2/CaptureRequest$Key;
-Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_GREEN:Landroid/hardware/camera2/CaptureRequest$Key;
-Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureRequest$Key;
-Landroid/hardware/camera2/CaptureResult$Key;-><init>(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V
-Landroid/hardware/camera2/CaptureResult$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V
-Landroid/hardware/camera2/CaptureResult$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;J)V
-Landroid/hardware/camera2/CaptureResult$Key;->getNativeKey()Landroid/hardware/camera2/impl/CameraMetadataNative$Key;
-Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_COORDINATES:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->QUIRKS_PARTIAL_RESULT:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->REQUEST_FRAME_COUNT:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->REQUEST_ID:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_IDS:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_LANDMARKS:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_RECTANGLES:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_SCORES:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_LENS_SHADING_MAP:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_TIMESTAMPS:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_X_SHIFTS:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_Y_SHIFTS:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_PREDICTED_COLOR_GAINS:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->STATISTICS_PREDICTED_COLOR_TRANSFORM:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->SYNC_FRAME_NUMBER:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_BLUE:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_GREEN:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureResult$Key;
-Landroid/hardware/camera2/impl/CameraMetadataNative$Key;->getTag()I
-Landroid/hardware/camera2/impl/CameraMetadataNative;->mMetadataPtr:J
-Landroid/hardware/camera2/utils/TypeReference;->createSpecializedTypeReference(Ljava/lang/reflect/Type;)Landroid/hardware/camera2/utils/TypeReference;
-Landroid/hardware/display/DisplayManagerGlobal;->getInstance()Landroid/hardware/display/DisplayManagerGlobal;
-Landroid/hardware/display/DisplayManagerGlobal;->getRealDisplay(I)Landroid/view/Display;
-Landroid/hardware/display/DisplayManagerGlobal;->mDm:Landroid/hardware/display/IDisplayManager;
-Landroid/hardware/display/DisplayManagerGlobal;->sInstance:Landroid/hardware/display/DisplayManagerGlobal;
-Landroid/hardware/display/IDisplayManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/display/IDisplayManager;
-Landroid/hardware/display/WifiDisplayStatus;->mActiveDisplay:Landroid/hardware/display/WifiDisplay;
-Landroid/hardware/display/WifiDisplayStatus;->mDisplays:[Landroid/hardware/display/WifiDisplay;
-Landroid/hardware/fingerprint/IFingerprintService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/hardware/input/IInputManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/hardware/input/IInputManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/input/IInputManager;
-Landroid/hardware/input/InputManager;->INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH:I
-Landroid/hardware/input/InputManager;->getInstance()Landroid/hardware/input/InputManager;
-Landroid/hardware/input/InputManager;->injectInputEvent(Landroid/view/InputEvent;I)Z
-Landroid/hardware/input/InputManager;->mIm:Landroid/hardware/input/IInputManager;
-Landroid/hardware/location/GeofenceHardware;-><init>(Landroid/hardware/location/IGeofenceHardware;)V
-Landroid/hardware/location/IActivityRecognitionHardwareClient$Stub;-><init>()V
-Landroid/hardware/location/IActivityRecognitionHardwareClient;->onAvailabilityChanged(ZLandroid/hardware/location/IActivityRecognitionHardware;)V
-Landroid/hardware/location/IContextHubService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/location/IContextHubService;
-Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;-><init>(II)V
-Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;->confidenceLevel:I
-Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;->userId:I
-Landroid/hardware/soundtrigger/SoundTrigger$GenericRecognitionEvent;-><init>(IIZIIIZLandroid/media/AudioFormat;[B)V
-Landroid/hardware/soundtrigger/SoundTrigger$GenericSoundModel;-><init>(Ljava/util/UUID;Ljava/util/UUID;[B)V
-Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->id:I
-Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->locale:Ljava/lang/String;
-Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->recognitionModes:I
-Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->text:Ljava/lang/String;
-Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->users:[I
-Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionEvent;-><init>(IIZIIIZLandroid/media/AudioFormat;[B[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;)V
-Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;-><init>(III[Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;)V
-Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->coarseConfidenceLevel:I
-Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->confidenceLevels:[Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;
-Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->id:I
-Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->recognitionModes:I
-Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseSoundModel;->keyphrases:[Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;
-Landroid/hardware/soundtrigger/SoundTrigger$ModuleProperties;-><init>(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIIZIZIZ)V
-Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;-><init>(ZZ[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;[B)V
-Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;->captureRequested:Z
-Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;->data:[B
-Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;->keyphrases:[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;
-Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;-><init>(IIZIIIZLandroid/media/AudioFormat;[B)V
-Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;->data:[B
-Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;->data:[B
-Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;->uuid:Ljava/util/UUID;
-Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;->vendorUuid:Ljava/util/UUID;
-Landroid/hardware/soundtrigger/SoundTrigger$SoundModelEvent;-><init>(II[B)V
-Landroid/hardware/soundtrigger/SoundTriggerModule;->mId:I
-Landroid/hardware/soundtrigger/SoundTriggerModule;->mNativeContext:J
-Landroid/hardware/soundtrigger/SoundTriggerModule;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V
-Landroid/hardware/usb/IUsbManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/hardware/usb/UsbDeviceConnection;->mNativeContext:J
-Landroid/hardware/usb/UsbManager;->getPortStatus(Landroid/hardware/usb/UsbPort;)Landroid/hardware/usb/UsbPortStatus;
-Landroid/hardware/usb/UsbManager;->getPorts()[Landroid/hardware/usb/UsbPort;
-Landroid/hardware/usb/UsbManager;->setCurrentFunction(Ljava/lang/String;Z)V
-Landroid/hardware/usb/UsbManager;->setPortRoles(Landroid/hardware/usb/UsbPort;II)V
-Landroid/hardware/usb/UsbPortStatus;->getCurrentDataRole()I
-Landroid/hardware/usb/UsbPortStatus;->getCurrentMode()I
-Landroid/hardware/usb/UsbPortStatus;->getCurrentPowerRole()I
-Landroid/hardware/usb/UsbPortStatus;->getSupportedRoleCombinations()I
-Landroid/hardware/usb/UsbPortStatus;->isConnected()Z
-Landroid/hardware/usb/UsbPortStatus;->isRoleCombinationSupported(II)Z
-Landroid/hardware/usb/UsbRequest;->mBuffer:Ljava/nio/ByteBuffer;
-Landroid/hardware/usb/UsbRequest;->mLength:I
-Landroid/hardware/usb/UsbRequest;->mNativeContext:J
-Landroid/icu/impl/CurrencyData;-><init>()V
-Landroid/icu/impl/TimeZoneGenericNames;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/impl/TimeZoneGenericNames;->serialVersionUID:J
-Landroid/icu/impl/locale/LocaleSyntaxException;->serialVersionUID:J
-Landroid/icu/impl/number/DecimalFormatProperties;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/impl/number/DecimalFormatProperties;->serialVersionUID:J
-Landroid/icu/impl/number/DecimalFormatProperties;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/math/BigDecimal;->serialVersionUID:J
-Landroid/icu/math/MathContext;->serialVersionUID:J
-Landroid/icu/text/ArabicShaping;->isAlefMaksouraChar(C)Z
-Landroid/icu/text/ArabicShaping;->isSeenTailFamilyChar(C)I
-Landroid/icu/text/ArabicShaping;->isTailChar(C)Z
-Landroid/icu/text/ArabicShaping;->isYehHamzaChar(C)Z
-Landroid/icu/text/ArabicShapingException;->serialVersionUID:J
-Landroid/icu/text/ChineseDateFormat$Field;->serialVersionUID:J
-Landroid/icu/text/ChineseDateFormat;->serialVersionUID:J
-Landroid/icu/text/ChineseDateFormatSymbols;->serialVersionUID:J
-Landroid/icu/text/CompactDecimalFormat;->serialVersionUID:J
-Landroid/icu/text/CurrencyPluralInfo;->serialVersionUID:J
-Landroid/icu/text/DateFormat$Field;->serialVersionUID:J
-Landroid/icu/text/DateFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/DateFormat;->serialVersionUID:J
-Landroid/icu/text/DateFormatSymbols;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale;
-Landroid/icu/text/DateFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/DateFormatSymbols;->serialVersionUID:J
-Landroid/icu/text/DateIntervalFormat;-><init>()V
-Landroid/icu/text/DateIntervalFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/DateIntervalFormat;->serialVersionUID:J
-Landroid/icu/text/DateIntervalInfo$PatternInfo;->serialVersionUID:J
-Landroid/icu/text/DateIntervalInfo;->serialVersionUID:J
-Landroid/icu/text/DateTimePatternGenerator$DistanceInfo;-><init>()V
-Landroid/icu/text/DecimalFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/DecimalFormat;->serialVersionUID:J
-Landroid/icu/text/DecimalFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/text/DecimalFormatSymbols;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale;
-Landroid/icu/text/DecimalFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/DecimalFormatSymbols;->serialVersionUID:J
-Landroid/icu/text/DecimalFormat_ICU58_Android;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/DecimalFormat_ICU58_Android;->serialVersionUID:J
-Landroid/icu/text/DecimalFormat_ICU58_Android;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/text/DurationFormat;->serialVersionUID:J
-Landroid/icu/text/MeasureFormat$MeasureProxy;->readResolve()Ljava/lang/Object;
-Landroid/icu/text/MeasureFormat$MeasureProxy;->serialVersionUID:J
-Landroid/icu/text/MeasureFormat;->serialVersionUID:J
-Landroid/icu/text/MeasureFormat;->writeReplace()Ljava/lang/Object;
-Landroid/icu/text/MessageFormat$Field;->serialVersionUID:J
-Landroid/icu/text/MessageFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/MessageFormat;->serialVersionUID:J
-Landroid/icu/text/MessageFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/text/NumberFormat$Field;->serialVersionUID:J
-Landroid/icu/text/NumberFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/NumberFormat;->serialVersionUID:J
-Landroid/icu/text/NumberFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/text/PluralFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/PluralFormat;->serialVersionUID:J
-Landroid/icu/text/PluralRules$AndConstraint;->serialVersionUID:J
-Landroid/icu/text/PluralRules$BinaryConstraint;->serialVersionUID:J
-Landroid/icu/text/PluralRules$FixedDecimal;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/PluralRules$FixedDecimal;->serialVersionUID:J
-Landroid/icu/text/PluralRules$FixedDecimal;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/text/PluralRules$OrConstraint;->serialVersionUID:J
-Landroid/icu/text/PluralRules$RangeConstraint;->serialVersionUID:J
-Landroid/icu/text/PluralRules$Rule;->serialVersionUID:J
-Landroid/icu/text/PluralRules$RuleList;->serialVersionUID:J
-Landroid/icu/text/PluralRules;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/PluralRules;->serialVersionUID:J
-Landroid/icu/text/PluralRules;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/text/PluralRules;->writeReplace()Ljava/lang/Object;
-Landroid/icu/text/RuleBasedCollator;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale;
-Landroid/icu/text/RuleBasedNumberFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/RuleBasedNumberFormat;->serialVersionUID:J
-Landroid/icu/text/RuleBasedNumberFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/text/SelectFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/SelectFormat;->serialVersionUID:J
-Landroid/icu/text/SimpleDateFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/SimpleDateFormat;->serialVersionUID:J
-Landroid/icu/text/SimpleDateFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/text/SpoofChecker$ScriptSet;-><init>()V
-Landroid/icu/text/SpoofChecker$ScriptSet;->and(I)V
-Landroid/icu/text/SpoofChecker$ScriptSet;->isFull()Z
-Landroid/icu/text/SpoofChecker$ScriptSet;->serialVersionUID:J
-Landroid/icu/text/SpoofChecker$ScriptSet;->setAll()V
-Landroid/icu/text/StringPrepParseException;->serialVersionUID:J
-Landroid/icu/text/TimeUnitFormat;->readResolve()Ljava/lang/Object;
-Landroid/icu/text/TimeUnitFormat;->serialVersionUID:J
-Landroid/icu/text/TimeUnitFormat;->writeReplace()Ljava/lang/Object;
-Landroid/icu/text/TimeZoneFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/text/TimeZoneFormat;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Landroid/icu/text/TimeZoneFormat;->serialVersionUID:J
-Landroid/icu/text/TimeZoneFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/text/TimeZoneNames$DefaultTimeZoneNames$FactoryImpl;-><init>()V
-Landroid/icu/text/TimeZoneNames$DefaultTimeZoneNames;->serialVersionUID:J
-Landroid/icu/text/TimeZoneNames;->serialVersionUID:J
-Landroid/icu/text/Transliterator;->createFromRules(Ljava/lang/String;Ljava/lang/String;I)Landroid/icu/text/Transliterator;
-Landroid/icu/text/Transliterator;->getInstance(Ljava/lang/String;)Landroid/icu/text/Transliterator;
-Landroid/icu/text/Transliterator;->transliterate(Ljava/lang/String;)Ljava/lang/String;
-Landroid/icu/text/UFormat;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale;
-Landroid/icu/text/UFormat;->serialVersionUID:J
-Landroid/icu/util/AnnualTimeZoneRule;->serialVersionUID:J
-Landroid/icu/util/BasicTimeZone;->serialVersionUID:J
-Landroid/icu/util/BuddhistCalendar;->serialVersionUID:J
-Landroid/icu/util/CECalendar;->serialVersionUID:J
-Landroid/icu/util/Calendar;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale;
-Landroid/icu/util/Calendar;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/util/Calendar;->serialVersionUID:J
-Landroid/icu/util/Calendar;->writeObject(Ljava/io/ObjectOutputStream;)V
-Landroid/icu/util/ChineseCalendar;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/util/ChineseCalendar;->serialVersionUID:J
-Landroid/icu/util/CopticCalendar;->serialVersionUID:J
-Landroid/icu/util/Currency;->readResolve()Ljava/lang/Object;
-Landroid/icu/util/Currency;->serialVersionUID:J
-Landroid/icu/util/Currency;->writeReplace()Ljava/lang/Object;
-Landroid/icu/util/DangiCalendar;->serialVersionUID:J
-Landroid/icu/util/DateInterval;->serialVersionUID:J
-Landroid/icu/util/DateTimeRule;->serialVersionUID:J
-Landroid/icu/util/EthiopicCalendar;->serialVersionUID:J
-Landroid/icu/util/GregorianCalendar;->serialVersionUID:J
-Landroid/icu/util/HebrewCalendar;->serialVersionUID:J
-Landroid/icu/util/ICUCloneNotSupportedException;->serialVersionUID:J
-Landroid/icu/util/ICUException;->serialVersionUID:J
-Landroid/icu/util/ICUUncheckedIOException;->serialVersionUID:J
-Landroid/icu/util/IllformedLocaleException;->serialVersionUID:J
-Landroid/icu/util/IndianCalendar;->serialVersionUID:J
-Landroid/icu/util/InitialTimeZoneRule;->serialVersionUID:J
-Landroid/icu/util/IslamicCalendar;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/util/IslamicCalendar;->serialVersionUID:J
-Landroid/icu/util/JapaneseCalendar;->serialVersionUID:J
-Landroid/icu/util/MeasureUnit$MeasureUnitProxy;->readResolve()Ljava/lang/Object;
-Landroid/icu/util/MeasureUnit$MeasureUnitProxy;->serialVersionUID:J
-Landroid/icu/util/MeasureUnit;->serialVersionUID:J
-Landroid/icu/util/MeasureUnit;->writeReplace()Ljava/lang/Object;
-Landroid/icu/util/NoUnit;->serialVersionUID:J
-Landroid/icu/util/PersianCalendar;->serialVersionUID:J
-Landroid/icu/util/RuleBasedTimeZone;->serialVersionUID:J
-Landroid/icu/util/STZInfo;->serialVersionUID:J
-Landroid/icu/util/SimpleTimeZone;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/icu/util/SimpleTimeZone;->serialVersionUID:J
-Landroid/icu/util/TaiwanCalendar;->serialVersionUID:J
-Landroid/icu/util/TimeArrayTimeZoneRule;->serialVersionUID:J
-Landroid/icu/util/TimeUnit;->readResolve()Ljava/lang/Object;
-Landroid/icu/util/TimeUnit;->serialVersionUID:J
-Landroid/icu/util/TimeUnit;->writeReplace()Ljava/lang/Object;
-Landroid/icu/util/TimeZone$ConstantZone;->serialVersionUID:J
-Landroid/icu/util/TimeZone;->serialVersionUID:J
-Landroid/icu/util/TimeZoneRule;->serialVersionUID:J
-Landroid/icu/util/ULocale;->serialVersionUID:J
-Landroid/icu/util/UResourceTypeMismatchException;->serialVersionUID:J
-Landroid/icu/util/VTimeZone;->serialVersionUID:J
-Landroid/inputmethodservice/InputMethodService$SettingsObserver;->shouldShowImeWithHardKeyboard()Z
-Landroid/inputmethodservice/InputMethodService;->mExtractEditText:Landroid/inputmethodservice/ExtractEditText;
-Landroid/inputmethodservice/InputMethodService;->mRootView:Landroid/view/View;
-Landroid/inputmethodservice/InputMethodService;->mSettingsObserver:Landroid/inputmethodservice/InputMethodService$SettingsObserver;
-Landroid/location/Country;->getCountryIso()Ljava/lang/String;
-Landroid/location/Country;->getSource()I
-Landroid/location/CountryDetector;->detectCountry()Landroid/location/Country;
-Landroid/location/GeocoderParams;->getClientPackage()Ljava/lang/String;
-Landroid/location/GeocoderParams;->getLocale()Ljava/util/Locale;
-Landroid/location/IGeocodeProvider$Stub;-><init>()V
-Landroid/location/IGeocodeProvider;->getFromLocation(DDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String;
-Landroid/location/IGeocodeProvider;->getFromLocationName(Ljava/lang/String;DDDDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String;
-Landroid/location/IGeofenceProvider$Stub;-><init>()V
-Landroid/location/IGeofenceProvider;->setGeofenceHardware(Landroid/hardware/location/IGeofenceHardware;)V
-Landroid/location/ILocationListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/location/ILocationListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/location/ILocationListener;->onLocationChanged(Landroid/location/Location;)V
-Landroid/location/ILocationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/location/ILocationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ILocationManager;
-Landroid/location/ILocationManager;->getNetworkProviderPackage()Ljava/lang/String;
-Landroid/location/ILocationManager;->reportLocation(Landroid/location/Location;Z)V
-Landroid/location/INetInitiatedListener$Stub;-><init>()V
-Landroid/location/INetInitiatedListener;->sendNiResponse(II)Z
-Landroid/location/Location;->mElapsedRealtimeNanos:J
-Landroid/location/Location;->removeBearingAccuracy()V
-Landroid/location/Location;->removeSpeedAccuracy()V
-Landroid/location/Location;->removeVerticalAccuracy()V
-Landroid/location/Location;->setExtraLocation(Ljava/lang/String;Landroid/location/Location;)V
-Landroid/location/LocationManager;->mService:Landroid/location/ILocationManager;
-Landroid/location/LocationRequest;->mHideFromAppOps:Z
-Landroid/location/LocationRequest;->mInterval:J
-Landroid/location/LocationRequest;->mProvider:Ljava/lang/String;
-Landroid/location/LocationRequest;->mWorkSource:Landroid/os/WorkSource;
-Landroid/media/AudioAttributes$Builder;->addTag(Ljava/lang/String;)Landroid/media/AudioAttributes$Builder;
-Landroid/media/AudioAttributes;->mContentType:I
-Landroid/media/AudioAttributes;->mFlags:I
-Landroid/media/AudioAttributes;->mFormattedTags:Ljava/lang/String;
-Landroid/media/AudioAttributes;->mSource:I
-Landroid/media/AudioAttributes;->mUsage:I
-Landroid/media/AudioAttributes;->toLegacyStreamType(Landroid/media/AudioAttributes;)I
-Landroid/media/AudioDevicePort;-><init>(Landroid/media/AudioHandle;Ljava/lang/String;[I[I[I[I[Landroid/media/AudioGain;ILjava/lang/String;)V
-Landroid/media/AudioDevicePortConfig;-><init>(Landroid/media/AudioDevicePort;IIILandroid/media/AudioGainConfig;)V
-Landroid/media/AudioFormat;-><init>()V
-Landroid/media/AudioFormat;-><init>(IIII)V
-Landroid/media/AudioFormat;->mChannelMask:I
-Landroid/media/AudioFormat;->mEncoding:I
-Landroid/media/AudioFormat;->mSampleRate:I
-Landroid/media/AudioGain;-><init>(IIIIIIIII)V
-Landroid/media/AudioGainConfig;-><init>(ILandroid/media/AudioGain;II[II)V
-Landroid/media/AudioGainConfig;->mChannelMask:I
-Landroid/media/AudioGainConfig;->mIndex:I
-Landroid/media/AudioGainConfig;->mMode:I
-Landroid/media/AudioGainConfig;->mRampDurationMs:I
-Landroid/media/AudioGainConfig;->mValues:[I
-Landroid/media/AudioHandle;-><init>(I)V
-Landroid/media/AudioHandle;->mId:I
-Landroid/media/AudioManager;-><init>(Landroid/content/Context;)V
-Landroid/media/AudioManager;->STREAM_BLUETOOTH_SCO:I
-Landroid/media/AudioManager;->STREAM_SYSTEM_ENFORCED:I
-Landroid/media/AudioManager;->STREAM_TTS:I
-Landroid/media/AudioManager;->forceVolumeControlStream(I)V
-Landroid/media/AudioManager;->getOutputLatency(I)I
-Landroid/media/AudioManager;->getService()Landroid/media/IAudioService;
-Landroid/media/AudioManager;->mAudioFocusIdListenerMap:Ljava/util/concurrent/ConcurrentHashMap;
-Landroid/media/AudioManager;->registerAudioPortUpdateListener(Landroid/media/AudioManager$OnAudioPortUpdateListener;)V
-Landroid/media/AudioManager;->setMasterMute(ZI)V
-Landroid/media/AudioManager;->setRingerModeInternal(I)V
-Landroid/media/AudioManager;->startBluetoothScoVirtualCall()V
-Landroid/media/AudioManager;->unregisterAudioPortUpdateListener(Landroid/media/AudioManager$OnAudioPortUpdateListener;)V
-Landroid/media/AudioMixPort;-><init>(Landroid/media/AudioHandle;IILjava/lang/String;[I[I[I[I[Landroid/media/AudioGain;)V
-Landroid/media/AudioMixPortConfig;-><init>(Landroid/media/AudioMixPort;IIILandroid/media/AudioGainConfig;)V
-Landroid/media/AudioPatch;-><init>(Landroid/media/AudioHandle;[Landroid/media/AudioPortConfig;[Landroid/media/AudioPortConfig;)V
-Landroid/media/AudioPatch;->mHandle:Landroid/media/AudioHandle;
-Landroid/media/AudioPort;-><init>(Landroid/media/AudioHandle;ILjava/lang/String;[I[I[I[I[Landroid/media/AudioGain;)V
-Landroid/media/AudioPort;->mActiveConfig:Landroid/media/AudioPortConfig;
-Landroid/media/AudioPort;->mGains:[Landroid/media/AudioGain;
-Landroid/media/AudioPort;->mHandle:Landroid/media/AudioHandle;
-Landroid/media/AudioPort;->mRole:I
-Landroid/media/AudioPortConfig;-><init>(Landroid/media/AudioPort;IIILandroid/media/AudioGainConfig;)V
-Landroid/media/AudioPortConfig;->mChannelMask:I
-Landroid/media/AudioPortConfig;->mConfigMask:I
-Landroid/media/AudioPortConfig;->mFormat:I
-Landroid/media/AudioPortConfig;->mGain:Landroid/media/AudioGainConfig;
-Landroid/media/AudioPortConfig;->mPort:Landroid/media/AudioPort;
-Landroid/media/AudioPortConfig;->mSamplingRate:I
-Landroid/media/AudioPortEventHandler;->mJniCallback:J
-Landroid/media/AudioPortEventHandler;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V
-Landroid/media/AudioRecord;->mNativeCallbackCookie:J
-Landroid/media/AudioRecord;->mNativeDeviceCallback:J
-Landroid/media/AudioRecord;->mNativeRecorderInJavaObj:J
-Landroid/media/AudioRecord;->native_release()V
-Landroid/media/AudioRecord;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V
-Landroid/media/AudioRecordingConfiguration;->getClientPackageName()Ljava/lang/String;
-Landroid/media/AudioRecordingConfiguration;->getClientUid()I
-Landroid/media/AudioSystem;->checkAudioFlinger()I
-Landroid/media/AudioSystem;->dynamicPolicyCallbackFromNative(ILjava/lang/String;I)V
-Landroid/media/AudioSystem;->errorCallbackFromNative(I)V
-Landroid/media/AudioSystem;->getForceUse(I)I
-Landroid/media/AudioSystem;->getParameters(Ljava/lang/String;)Ljava/lang/String;
-Landroid/media/AudioSystem;->getPrimaryOutputFrameCount()I
-Landroid/media/AudioSystem;->getPrimaryOutputSamplingRate()I
-Landroid/media/AudioSystem;->isSourceActive(I)Z
-Landroid/media/AudioSystem;->isStreamActive(II)Z
-Landroid/media/AudioSystem;->recordingCallbackFromNative(IIII[I)V
-Landroid/media/AudioSystem;->setDeviceConnectionState(IILjava/lang/String;Ljava/lang/String;)I
-Landroid/media/AudioSystem;->setErrorCallback(Landroid/media/AudioSystem$ErrorCallback;)V
-Landroid/media/AudioSystem;->setForceUse(II)I
-Landroid/media/AudioSystem;->setParameters(Ljava/lang/String;)I
-Landroid/media/AudioTrack;->deferred_connect(J)V
-Landroid/media/AudioTrack;->getLatency()I
-Landroid/media/AudioTrack;->mJniData:J
-Landroid/media/AudioTrack;->mNativeTrackInJavaObj:J
-Landroid/media/AudioTrack;->mStreamType:I
-Landroid/media/AudioTrack;->native_release()V
-Landroid/media/AudioTrack;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V
-Landroid/media/ExifInterface;->getDateTime()J
-Landroid/media/IAudioService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/media/IAudioService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IAudioService;
-Landroid/media/IAudioService;->getStreamMaxVolume(I)I
-Landroid/media/IAudioService;->getStreamVolume(I)I
-Landroid/media/IAudioService;->setStreamVolume(IIILjava/lang/String;)V
-Landroid/media/IMediaRouterService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IMediaRouterService;
-Landroid/media/IMediaScannerService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IMediaScannerService;
-Landroid/media/IMediaScannerService;->scanFile(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/media/IRemoteDisplayCallback;->onStateChanged(Landroid/media/RemoteDisplayState;)V
-Landroid/media/IVolumeController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IVolumeController;
-Landroid/media/Image;-><init>()V
-Landroid/media/JetPlayer;->mNativePlayerInJavaObj:J
-Landroid/media/JetPlayer;->postEventFromNative(Ljava/lang/Object;III)V
-Landroid/media/MediaCodec$CodecException;-><init>(IILjava/lang/String;)V
-Landroid/media/MediaCodec;->getBuffers(Z)[Ljava/nio/ByteBuffer;
-Landroid/media/MediaCodec;->releaseOutputBuffer(IZZJ)V
-Landroid/media/MediaDrm$Certificate;->getContent()[B
-Landroid/media/MediaDrm$Certificate;->getWrappedPrivateKey()[B
-Landroid/media/MediaDrm$CertificateRequest;->getData()[B
-Landroid/media/MediaDrm$CertificateRequest;->getDefaultUrl()Ljava/lang/String;
-Landroid/media/MediaDrm;->getCertificateRequest(ILjava/lang/String;)Landroid/media/MediaDrm$CertificateRequest;
-Landroid/media/MediaDrm;->provideCertificateResponse([B)Landroid/media/MediaDrm$Certificate;
-Landroid/media/MediaDrm;->signRSA([BLjava/lang/String;[B[B)[B
-Landroid/media/MediaFile$MediaFileType;->fileType:I
-Landroid/media/MediaFile$MediaFileType;->mimeType:Ljava/lang/String;
-Landroid/media/MediaFile;-><init>()V
-Landroid/media/MediaFile;->FIRST_AUDIO_FILE_TYPE:I
-Landroid/media/MediaFile;->LAST_AUDIO_FILE_TYPE:I
-Landroid/media/MediaFile;->getFileType(Ljava/lang/String;)Landroid/media/MediaFile$MediaFileType;
-Landroid/media/MediaFile;->getFileTypeForMimeType(Ljava/lang/String;)I
-Landroid/media/MediaFile;->getMimeTypeForFile(Ljava/lang/String;)Ljava/lang/String;
-Landroid/media/MediaFile;->isAudioFileType(I)Z
-Landroid/media/MediaFile;->isImageFileType(I)Z
-Landroid/media/MediaFile;->isPlayListFileType(I)Z
-Landroid/media/MediaFile;->isVideoFileType(I)Z
-Landroid/media/MediaFile;->sFileTypeMap:Ljava/util/HashMap;
-Landroid/media/MediaFormat;->getMap()Ljava/util/Map;
-Landroid/media/MediaHTTPService;->createHttpServiceBinderIfNecessary(Ljava/lang/String;)Landroid/os/IBinder;
-Landroid/media/MediaMetadataRetriever;->getEmbeddedPicture(I)[B
-Landroid/media/MediaPlayer;->getMetadata(ZZ)Landroid/media/Metadata;
-Landroid/media/MediaPlayer;->invoke(Landroid/os/Parcel;Landroid/os/Parcel;)V
-Landroid/media/MediaPlayer;->mEventHandler:Landroid/media/MediaPlayer$EventHandler;
-Landroid/media/MediaPlayer;->newRequest()Landroid/os/Parcel;
-Landroid/media/MediaPlayer;->setDataSource(Ljava/lang/String;Ljava/util/Map;)V
-Landroid/media/MediaPlayer;->setDataSource(Ljava/lang/String;Ljava/util/Map;Ljava/util/List;)V
-Landroid/media/MediaPlayer;->setDataSource(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/util/List;)V
-Landroid/media/MediaPlayer;->setRetransmitEndpoint(Ljava/net/InetSocketAddress;)V
-Landroid/media/MediaRecorder;->setParameter(Ljava/lang/String;)V
-Landroid/media/MediaRouter$RouteInfo;->STATUS_CONNECTING:I
-Landroid/media/MediaRouter$RouteInfo;->getStatusCode()I
-Landroid/media/MediaRouter;->selectRouteInt(ILandroid/media/MediaRouter$RouteInfo;Z)V
-Landroid/media/MediaScanner;->isNoMediaPath(Ljava/lang/String;)Z
-Landroid/media/MediaScanner;->mClient:Landroid/media/MediaScanner$MyMediaScannerClient;
-Landroid/media/MediaScanner;->scanSingleFile(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri;
-Landroid/media/Metadata;->PAUSE_AVAILABLE:I
-Landroid/media/Metadata;->SEEK_BACKWARD_AVAILABLE:I
-Landroid/media/Metadata;->SEEK_FORWARD_AVAILABLE:I
-Landroid/media/Metadata;->getBoolean(I)Z
-Landroid/media/Metadata;->has(I)Z
-Landroid/media/MicrophoneInfo;-><init>(Ljava/lang/String;ILjava/lang/String;IIILandroid/media/MicrophoneInfo$Coordinate3F;Landroid/media/MicrophoneInfo$Coordinate3F;Ljava/util/List;Ljava/util/List;FFFI)V
-Landroid/media/MiniThumbFile;->reset()V
-Landroid/media/PlaybackParams;->SET_AUDIO_FALLBACK_MODE:I
-Landroid/media/PlaybackParams;->SET_AUDIO_STRETCH_MODE:I
-Landroid/media/PlaybackParams;->SET_PITCH:I
-Landroid/media/PlaybackParams;->SET_SPEED:I
-Landroid/media/PlaybackParams;->mAudioFallbackMode:I
-Landroid/media/PlaybackParams;->mAudioStretchMode:I
-Landroid/media/PlaybackParams;->mPitch:F
-Landroid/media/PlaybackParams;->mSet:I
-Landroid/media/PlaybackParams;->mSpeed:F
-Landroid/media/RemoteDisplay;->notifyDisplayConnected(Landroid/view/Surface;IIII)V
-Landroid/media/RemoteDisplay;->notifyDisplayDisconnected()V
-Landroid/media/RemoteDisplay;->notifyDisplayError(I)V
-Landroid/media/RemoteDisplayState;-><init>()V
-Landroid/media/RemoteDisplayState;->displays:Ljava/util/ArrayList;
-Landroid/media/RingtoneManager;->getRingtone(Landroid/content/Context;Landroid/net/Uri;I)Landroid/media/Ringtone;
-Landroid/media/SubtitleController;->mHandler:Landroid/os/Handler;
-Landroid/media/SubtitleTrack$RenderingWidget;->draw(Landroid/graphics/Canvas;)V
-Landroid/media/SubtitleTrack$RenderingWidget;->onAttachedToWindow()V
-Landroid/media/SubtitleTrack$RenderingWidget;->onDetachedFromWindow()V
-Landroid/media/SubtitleTrack$RenderingWidget;->setOnChangedListener(Landroid/media/SubtitleTrack$RenderingWidget$OnChangedListener;)V
-Landroid/media/SubtitleTrack$RenderingWidget;->setSize(II)V
-Landroid/media/ThumbnailUtils;->createImageThumbnail(Ljava/lang/String;I)Landroid/graphics/Bitmap;
-Landroid/media/ToneGenerator;->mNativeContext:J
-Landroid/media/VolumeShaper$Configuration;-><init>(IIIDI[F[F)V
-Landroid/media/VolumeShaper$Configuration;->mDurationMs:D
-Landroid/media/VolumeShaper$Configuration;->mId:I
-Landroid/media/VolumeShaper$Configuration;->mInterpolatorType:I
-Landroid/media/VolumeShaper$Configuration;->mOptionFlags:I
-Landroid/media/VolumeShaper$Configuration;->mTimes:[F
-Landroid/media/VolumeShaper$Configuration;->mType:I
-Landroid/media/VolumeShaper$Configuration;->mVolumes:[F
-Landroid/media/VolumeShaper$Operation;-><init>(IIF)V
-Landroid/media/VolumeShaper$Operation;->mFlags:I
-Landroid/media/VolumeShaper$Operation;->mReplaceId:I
-Landroid/media/VolumeShaper$Operation;->mXOffset:F
-Landroid/media/VolumeShaper$State;-><init>(FF)V
-Landroid/media/VolumeShaper$State;->mVolume:F
-Landroid/media/VolumeShaper$State;->mXOffset:F
-Landroid/media/audiofx/AudioEffect;-><init>(Ljava/util/UUID;Ljava/util/UUID;II)V
-Landroid/media/audiofx/AudioEffect;->command(I[B[B)I
-Landroid/media/audiofx/AudioEffect;->getParameter([I[B)I
-Landroid/media/audiofx/AudioEffect;->getParameter([I[I)I
-Landroid/media/audiofx/AudioEffect;->setParameter([I[S)I
-Landroid/media/audiopolicy/AudioMix;->mCallbackFlags:I
-Landroid/media/audiopolicy/AudioMix;->mDeviceAddress:Ljava/lang/String;
-Landroid/media/audiopolicy/AudioMix;->mDeviceSystemType:I
-Landroid/media/audiopolicy/AudioMix;->mFormat:Landroid/media/AudioFormat;
-Landroid/media/audiopolicy/AudioMix;->mMixType:I
-Landroid/media/audiopolicy/AudioMix;->mRouteFlags:I
-Landroid/media/audiopolicy/AudioMix;->mRule:Landroid/media/audiopolicy/AudioMixingRule;
-Landroid/media/audiopolicy/AudioMixingRule$AudioMixMatchCriterion;->mAttr:Landroid/media/AudioAttributes;
-Landroid/media/audiopolicy/AudioMixingRule$AudioMixMatchCriterion;->mIntProp:I
-Landroid/media/audiopolicy/AudioMixingRule$AudioMixMatchCriterion;->mRule:I
-Landroid/media/audiopolicy/AudioMixingRule;->mCriteria:Ljava/util/ArrayList;
-Landroid/media/session/ISessionManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/session/ISessionManager;
-Landroid/media/session/MediaSession;->getCallingPackage()Ljava/lang/String;
-Landroid/media/session/MediaSession;->mCallback:Landroid/media/session/MediaSession$CallbackMessageHandler;
-Landroid/media/session/MediaSessionLegacyHelper;->getHelper(Landroid/content/Context;)Landroid/media/session/MediaSessionLegacyHelper;
-Landroid/media/soundtrigger/SoundTriggerDetector$EventPayload;->getCaptureSession()Ljava/lang/Integer;
-Landroid/media/soundtrigger/SoundTriggerDetector$EventPayload;->getData()[B
-Landroid/media/soundtrigger/SoundTriggerManager;->loadSoundModel(Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;)I
-Landroid/media/soundtrigger/SoundTriggerManager;->startRecognition(Ljava/util/UUID;Landroid/app/PendingIntent;Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;)I
-Landroid/media/soundtrigger/SoundTriggerManager;->startRecognition(Ljava/util/UUID;Landroid/os/Bundle;Landroid/content/ComponentName;Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;)I
-Landroid/media/soundtrigger/SoundTriggerManager;->stopRecognition(Ljava/util/UUID;)I
-Landroid/media/soundtrigger/SoundTriggerManager;->unloadSoundModel(Ljava/util/UUID;)I
-Landroid/media/tv/ITvRemoteProvider$Stub;-><init>()V
-Landroid/media/tv/ITvRemoteServiceInput;->clearInputBridge(Landroid/os/IBinder;)V
-Landroid/media/tv/ITvRemoteServiceInput;->closeInputBridge(Landroid/os/IBinder;)V
-Landroid/media/tv/ITvRemoteServiceInput;->openInputBridge(Landroid/os/IBinder;Ljava/lang/String;III)V
-Landroid/media/tv/ITvRemoteServiceInput;->sendKeyDown(Landroid/os/IBinder;I)V
-Landroid/media/tv/ITvRemoteServiceInput;->sendKeyUp(Landroid/os/IBinder;I)V
-Landroid/media/tv/ITvRemoteServiceInput;->sendPointerDown(Landroid/os/IBinder;III)V
-Landroid/media/tv/ITvRemoteServiceInput;->sendPointerSync(Landroid/os/IBinder;)V
-Landroid/media/tv/ITvRemoteServiceInput;->sendPointerUp(Landroid/os/IBinder;I)V
-Landroid/media/tv/ITvRemoteServiceInput;->sendTimestamp(Landroid/os/IBinder;J)V
-Landroid/media/tv/TvInputManager$Hardware;->dispatchKeyEventToHdmi(Landroid/view/KeyEvent;)Z
-Landroid/media/tv/TvInputManager;->acquireTvInputHardware(ILandroid/media/tv/TvInputManager$HardwareCallback;Landroid/media/tv/TvInputInfo;)Landroid/media/tv/TvInputManager$Hardware;
-Landroid/media/tv/TvView;->requestUnblockContent(Landroid/media/tv/TvContentRating;)V
-Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V
-Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;
-Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I
-Landroid/net/ConnectivityManager;->TYPE_NONE:I
-Landroid/net/ConnectivityManager;->TYPE_PROXY:I
-Landroid/net/ConnectivityManager;->TYPE_WIFI_P2P:I
-Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;
-Landroid/net/ConnectivityManager;->getActiveNetworkQuotaInfo()Landroid/net/NetworkQuotaInfo;
-Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;
-Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z
-Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;
-Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;
-Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;
-Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z
-Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z
-Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;
-Landroid/net/ConnectivityManager;->registerNetworkFactory(Landroid/os/Messenger;Ljava/lang/String;)V
-Landroid/net/ConnectivityManager;->requestRouteToHost(II)Z
-Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z
-Landroid/net/ConnectivityManager;->setAirplaneMode(Z)V
-Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V
-Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive;
-Landroid/net/ConnectivityManager;->startUsingNetworkFeature(ILjava/lang/String;)I
-Landroid/net/ConnectivityManager;->stopUsingNetworkFeature(ILjava/lang/String;)I
-Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I
-Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I
-Landroid/net/DhcpResults;-><init>()V
-Landroid/net/DhcpResults;-><init>(Landroid/net/DhcpResults;)V
-Landroid/net/DhcpResults;-><init>(Landroid/net/StaticIpConfiguration;)V
-Landroid/net/DhcpResults;->leaseDuration:I
-Landroid/net/DhcpResults;->mtu:I
-Landroid/net/DhcpResults;->serverAddress:Ljava/net/Inet4Address;
-Landroid/net/DhcpResults;->vendorInfo:Ljava/lang/String;
-Landroid/net/IConnectivityManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveLinkProperties()Landroid/net/LinkProperties;
-Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveNetworkInfo()Landroid/net/NetworkInfo;
-Landroid/net/IConnectivityManager$Stub$Proxy;->getAllNetworkInfo()[Landroid/net/NetworkInfo;
-Landroid/net/IConnectivityManager$Stub$Proxy;->getAllNetworks()[Landroid/net/Network;
-Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableIfaces()[Ljava/lang/String;
-Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableUsbRegexs()[Ljava/lang/String;
-Landroid/net/IConnectivityManager$Stub$Proxy;->getTetheredIfaces()[Ljava/lang/String;
-Landroid/net/IConnectivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/net/IConnectivityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IConnectivityManager;
-Landroid/net/IConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;
-Landroid/net/IConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo;
-Landroid/net/IConnectivityManager;->getAllNetworkInfo()[Landroid/net/NetworkInfo;
-Landroid/net/IConnectivityManager;->getAllNetworkState()[Landroid/net/NetworkState;
-Landroid/net/IConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;
-Landroid/net/INetd$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetd;
-Landroid/net/INetd;->interfaceAddAddress(Ljava/lang/String;Ljava/lang/String;I)V
-Landroid/net/INetworkPolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkPolicyManager;
-Landroid/net/INetworkPolicyManager;->getNetworkQuotaInfo(Landroid/net/NetworkState;)Landroid/net/NetworkQuotaInfo;
-Landroid/net/INetworkScoreService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkScoreService;
-Landroid/net/INetworkStatsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/net/INetworkStatsService$Stub$Proxy;->getMobileIfaces()[Ljava/lang/String;
-Landroid/net/INetworkStatsService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStatsService;
-Landroid/net/INetworkStatsService;->openSession()Landroid/net/INetworkStatsSession;
-Landroid/net/INetworkStatsSession;->getHistoryForNetwork(Landroid/net/NetworkTemplate;I)Landroid/net/NetworkStatsHistory;
-Landroid/net/INetworkStatsSession;->getHistoryForUid(Landroid/net/NetworkTemplate;IIII)Landroid/net/NetworkStatsHistory;
-Landroid/net/InterfaceConfiguration;-><init>()V
-Landroid/net/InterfaceConfiguration;->setLinkAddress(Landroid/net/LinkAddress;)V
-Landroid/net/IpConfiguration;->httpProxy:Landroid/net/ProxyInfo;
-Landroid/net/LinkAddress;-><init>(Ljava/lang/String;)V
-Landroid/net/LinkAddress;-><init>(Ljava/net/InetAddress;I)V
-Landroid/net/LinkAddress;->isIPv6()Z
-Landroid/net/LinkAddress;->isSameAddressAs(Landroid/net/LinkAddress;)Z
-Landroid/net/LinkProperties$ProvisioningChange;->GAINED_PROVISIONING:Landroid/net/LinkProperties$ProvisioningChange;
-Landroid/net/LinkProperties$ProvisioningChange;->LOST_PROVISIONING:Landroid/net/LinkProperties$ProvisioningChange;
-Landroid/net/LinkProperties$ProvisioningChange;->STILL_NOT_PROVISIONED:Landroid/net/LinkProperties$ProvisioningChange;
-Landroid/net/LinkProperties$ProvisioningChange;->STILL_PROVISIONED:Landroid/net/LinkProperties$ProvisioningChange;
-Landroid/net/LinkProperties$ProvisioningChange;->values()[Landroid/net/LinkProperties$ProvisioningChange;
-Landroid/net/LinkProperties;-><init>()V
-Landroid/net/LinkProperties;-><init>(Landroid/net/LinkProperties;)V
-Landroid/net/LinkProperties;->addDnsServer(Ljava/net/InetAddress;)Z
-Landroid/net/LinkProperties;->addRoute(Landroid/net/RouteInfo;)Z
-Landroid/net/LinkProperties;->addStackedLink(Landroid/net/LinkProperties;)Z
-Landroid/net/LinkProperties;->clear()V
-Landroid/net/LinkProperties;->compareProvisioning(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Landroid/net/LinkProperties$ProvisioningChange;
-Landroid/net/LinkProperties;->getAllInterfaceNames()Ljava/util/List;
-Landroid/net/LinkProperties;->getAllRoutes()Ljava/util/List;
-Landroid/net/LinkProperties;->getMtu()I
-Landroid/net/LinkProperties;->getStackedLinks()Ljava/util/List;
-Landroid/net/LinkProperties;->hasGlobalIPv6Address()Z
-Landroid/net/LinkProperties;->hasIPv4Address()Z
-Landroid/net/LinkProperties;->hasIPv4DefaultRoute()Z
-Landroid/net/LinkProperties;->hasIPv4DnsServer()Z
-Landroid/net/LinkProperties;->hasIPv6DefaultRoute()Z
-Landroid/net/LinkProperties;->hasIPv6DnsServer()Z
-Landroid/net/LinkProperties;->isIPv6Provisioned()Z
-Landroid/net/LinkProperties;->isIdenticalAddresses(Landroid/net/LinkProperties;)Z
-Landroid/net/LinkProperties;->isIdenticalDnses(Landroid/net/LinkProperties;)Z
-Landroid/net/LinkProperties;->isIdenticalRoutes(Landroid/net/LinkProperties;)Z
-Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkProperties;)Z
-Landroid/net/LinkProperties;->isProvisioned()Z
-Landroid/net/LinkProperties;->isReachable(Ljava/net/InetAddress;)Z
-Landroid/net/LinkProperties;->removeDnsServer(Ljava/net/InetAddress;)Z
-Landroid/net/LinkProperties;->removeRoute(Landroid/net/RouteInfo;)Z
-Landroid/net/LinkProperties;->setDnsServers(Ljava/util/Collection;)V
-Landroid/net/LinkProperties;->setDomains(Ljava/lang/String;)V
-Landroid/net/LinkProperties;->setHttpProxy(Landroid/net/ProxyInfo;)V
-Landroid/net/LinkProperties;->setInterfaceName(Ljava/lang/String;)V
-Landroid/net/LinkProperties;->setLinkAddresses(Ljava/util/Collection;)V
-Landroid/net/LinkProperties;->setMtu(I)V
-Landroid/net/LinkProperties;->setTcpBufferSizes(Ljava/lang/String;)V
-Landroid/net/LocalSocketImpl;->inboundFileDescriptors:[Ljava/io/FileDescriptor;
-Landroid/net/LocalSocketImpl;->outboundFileDescriptors:[Ljava/io/FileDescriptor;
-Landroid/net/MacAddress;->ALL_ZEROS_ADDRESS:Landroid/net/MacAddress;
-Landroid/net/Network;-><init>(I)V
-Landroid/net/Network;->netId:I
-Landroid/net/NetworkBadging$Badging;
-Landroid/net/NetworkBadging;
-Landroid/net/NetworkBadging;->BADGING_4K:I
-Landroid/net/NetworkBadging;->BADGING_HD:I
-Landroid/net/NetworkBadging;->BADGING_NONE:I
-Landroid/net/NetworkBadging;->BADGING_SD:I
-Landroid/net/NetworkBadging;->getWifiIcon(IILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
-Landroid/net/NetworkCapabilities;->getCapabilities()[I
-Landroid/net/NetworkCapabilities;->getNetworkSpecifier()Landroid/net/NetworkSpecifier;
-Landroid/net/NetworkCapabilities;->getSignalStrength()I
-Landroid/net/NetworkCapabilities;->getTransportTypes()[I
-Landroid/net/NetworkCapabilities;->hasSignalStrength()Z
-Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;
-Landroid/net/NetworkPolicyManager;->mService:Landroid/net/INetworkPolicyManager;
-Landroid/net/NetworkQuotaInfo;->getEstimatedBytes()J
-Landroid/net/NetworkQuotaInfo;->getHardLimitBytes()J
-Landroid/net/NetworkQuotaInfo;->getSoftLimitBytes()J
-Landroid/net/NetworkRequest$Builder;->setSignalStrength(I)Landroid/net/NetworkRequest$Builder;
-Landroid/net/NetworkRequest;->networkCapabilities:Landroid/net/NetworkCapabilities;
-Landroid/net/NetworkState;->network:Landroid/net/Network;
-Landroid/net/NetworkStats$Entry;-><init>()V
-Landroid/net/NetworkStats$Entry;->iface:Ljava/lang/String;
-Landroid/net/NetworkStats$Entry;->rxBytes:J
-Landroid/net/NetworkStats$Entry;->rxPackets:J
-Landroid/net/NetworkStats$Entry;->set:I
-Landroid/net/NetworkStats$Entry;->tag:I
-Landroid/net/NetworkStats$Entry;->txBytes:J
-Landroid/net/NetworkStats$Entry;->txPackets:J
-Landroid/net/NetworkStats$Entry;->uid:I
-Landroid/net/NetworkStats;-><init>(JI)V
-Landroid/net/NetworkStats;->capacity:I
-Landroid/net/NetworkStats;->combineValues(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats;
-Landroid/net/NetworkStats;->defaultNetwork:[I
-Landroid/net/NetworkStats;->iface:[Ljava/lang/String;
-Landroid/net/NetworkStats;->metered:[I
-Landroid/net/NetworkStats;->operations:[J
-Landroid/net/NetworkStats;->roaming:[I
-Landroid/net/NetworkStats;->rxBytes:[J
-Landroid/net/NetworkStats;->rxPackets:[J
-Landroid/net/NetworkStats;->set:[I
-Landroid/net/NetworkStats;->size:I
-Landroid/net/NetworkStats;->tag:[I
-Landroid/net/NetworkStats;->txBytes:[J
-Landroid/net/NetworkStats;->txPackets:[J
-Landroid/net/NetworkStats;->uid:[I
-Landroid/net/NetworkStatsHistory$Entry;->rxBytes:J
-Landroid/net/NetworkStatsHistory$Entry;->txBytes:J
-Landroid/net/NetworkStatsHistory;->getStart()J
-Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;
-Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate;
-Landroid/net/NetworkTemplate;->buildTemplateWifi()Landroid/net/NetworkTemplate;
-Landroid/net/NetworkUtils;->attachControlPacketFilter(Ljava/io/FileDescriptor;I)V
-Landroid/net/NetworkUtils;->attachDhcpFilter(Ljava/io/FileDescriptor;)V
-Landroid/net/NetworkUtils;->attachRaFilter(Ljava/io/FileDescriptor;I)V
-Landroid/net/NetworkUtils;->getImplicitNetmask(Ljava/net/Inet4Address;)I
-Landroid/net/NetworkUtils;->netmaskToPrefixLength(Ljava/net/Inet4Address;)I
-Landroid/net/NetworkUtils;->protectFromVpn(Ljava/io/FileDescriptor;)Z
-Landroid/net/Proxy;->getProxy(Landroid/content/Context;Ljava/lang/String;)Ljava/net/Proxy;
-Landroid/net/ProxyInfo;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-Landroid/net/RouteInfo;-><init>(Landroid/net/IpPrefix;Ljava/net/InetAddress;Ljava/lang/String;)V
-Landroid/net/RouteInfo;->hasGateway()Z
-Landroid/net/RouteInfo;->selectBestRoute(Ljava/util/Collection;Ljava/net/InetAddress;)Landroid/net/RouteInfo;
-Landroid/net/SSLCertificateSocketFactory;-><init>(ILandroid/net/SSLSessionCache;Z)V
-Landroid/net/SSLCertificateSocketFactory;->INSECURE_TRUST_MANAGER:[Ljavax/net/ssl/TrustManager;
-Landroid/net/SSLCertificateSocketFactory;->TAG:Ljava/lang/String;
-Landroid/net/SSLCertificateSocketFactory;->castToOpenSSLSocket(Ljava/net/Socket;)Lcom/android/org/conscrypt/OpenSSLSocketImpl;
-Landroid/net/SSLCertificateSocketFactory;->getAlpnSelectedProtocol(Ljava/net/Socket;)[B
-Landroid/net/SSLCertificateSocketFactory;->getDelegate()Ljavax/net/ssl/SSLSocketFactory;
-Landroid/net/SSLCertificateSocketFactory;->getHttpSocketFactory(ILandroid/net/SSLSessionCache;)Lorg/apache/http/conn/ssl/SSLSocketFactory;
-Landroid/net/SSLCertificateSocketFactory;->isSslCheckRelaxed()Z
-Landroid/net/SSLCertificateSocketFactory;->mAlpnProtocols:[B
-Landroid/net/SSLCertificateSocketFactory;->mChannelIdPrivateKey:Ljava/security/PrivateKey;
-Landroid/net/SSLCertificateSocketFactory;->mHandshakeTimeoutMillis:I
-Landroid/net/SSLCertificateSocketFactory;->mInsecureFactory:Ljavax/net/ssl/SSLSocketFactory;
-Landroid/net/SSLCertificateSocketFactory;->mKeyManagers:[Ljavax/net/ssl/KeyManager;
-Landroid/net/SSLCertificateSocketFactory;->mNpnProtocols:[B
-Landroid/net/SSLCertificateSocketFactory;->mSecure:Z
-Landroid/net/SSLCertificateSocketFactory;->mSecureFactory:Ljavax/net/ssl/SSLSocketFactory;
-Landroid/net/SSLCertificateSocketFactory;->mSessionCache:Lcom/android/org/conscrypt/SSLClientSessionCache;
-Landroid/net/SSLCertificateSocketFactory;->mTrustManagers:[Ljavax/net/ssl/TrustManager;
-Landroid/net/SSLCertificateSocketFactory;->makeSocketFactory([Ljavax/net/ssl/KeyManager;[Ljavax/net/ssl/TrustManager;)Ljavax/net/ssl/SSLSocketFactory;
-Landroid/net/SSLCertificateSocketFactory;->setAlpnProtocols([[B)V
-Landroid/net/SSLCertificateSocketFactory;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V
-Landroid/net/SSLCertificateSocketFactory;->setSoWriteTimeout(Ljava/net/Socket;I)V
-Landroid/net/SSLCertificateSocketFactory;->verifyHostname(Ljava/net/Socket;Ljava/lang/String;)V
-Landroid/net/SSLSessionCache;->mSessionCache:Lcom/android/org/conscrypt/SSLClientSessionCache;
-Landroid/net/SntpClient;-><init>()V
-Landroid/net/SntpClient;->getNtpTime()J
-Landroid/net/SntpClient;->getNtpTimeReference()J
-Landroid/net/SntpClient;->getRoundTripTime()J
-Landroid/net/SntpClient;->requestTime(Ljava/lang/String;I)Z
-Landroid/net/StaticIpConfiguration;-><init>()V
-Landroid/net/StaticIpConfiguration;->dnsServers:Ljava/util/ArrayList;
-Landroid/net/StaticIpConfiguration;->domains:Ljava/lang/String;
-Landroid/net/StaticIpConfiguration;->gateway:Ljava/net/InetAddress;
-Landroid/net/StaticIpConfiguration;->getRoutes(Ljava/lang/String;)Ljava/util/List;
-Landroid/net/StaticIpConfiguration;->ipAddress:Landroid/net/LinkAddress;
-Landroid/net/StringNetworkSpecifier;->specifier:Ljava/lang/String;
-Landroid/net/TrafficStats;->getMobileIfaces()[Ljava/lang/String;
-Landroid/net/TrafficStats;->getMobileTcpRxPackets()J
-Landroid/net/TrafficStats;->getMobileTcpTxPackets()J
-Landroid/net/TrafficStats;->getRxBytes(Ljava/lang/String;)J
-Landroid/net/TrafficStats;->getStatsService()Landroid/net/INetworkStatsService;
-Landroid/net/TrafficStats;->getTxBytes(Ljava/lang/String;)J
-Landroid/net/TrafficStats;->setThreadStatsUidSelf()V
-Landroid/net/Uri;-><init>()V
-Landroid/net/http/SslError;->mCertificate:Landroid/net/http/SslCertificate;
-Landroid/net/metrics/ApfProgramEvent;-><init>()V
-Landroid/net/metrics/ApfProgramEvent;->actualLifetime:J
-Landroid/net/metrics/ApfProgramEvent;->currentRas:I
-Landroid/net/metrics/ApfProgramEvent;->filteredRas:I
-Landroid/net/metrics/ApfProgramEvent;->flags:I
-Landroid/net/metrics/ApfProgramEvent;->flagsFor(ZZ)I
-Landroid/net/metrics/ApfProgramEvent;->lifetime:J
-Landroid/net/metrics/ApfProgramEvent;->programLength:I
-Landroid/net/metrics/ApfStats;-><init>()V
-Landroid/net/metrics/ApfStats;->droppedRas:I
-Landroid/net/metrics/ApfStats;->durationMs:J
-Landroid/net/metrics/ApfStats;->matchingRas:I
-Landroid/net/metrics/ApfStats;->maxProgramSize:I
-Landroid/net/metrics/ApfStats;->parseErrors:I
-Landroid/net/metrics/ApfStats;->programUpdates:I
-Landroid/net/metrics/ApfStats;->programUpdatesAll:I
-Landroid/net/metrics/ApfStats;->programUpdatesAllowingMulticast:I
-Landroid/net/metrics/ApfStats;->receivedRas:I
-Landroid/net/metrics/ApfStats;->zeroLifetimeRas:I
-Landroid/net/metrics/DhcpClientEvent;-><init>(Ljava/lang/String;I)V
-Landroid/net/metrics/DhcpErrorEvent;-><init>(I)V
-Landroid/net/metrics/DhcpErrorEvent;->BOOTP_TOO_SHORT:I
-Landroid/net/metrics/DhcpErrorEvent;->BUFFER_UNDERFLOW:I
-Landroid/net/metrics/DhcpErrorEvent;->DHCP_BAD_MAGIC_COOKIE:I
-Landroid/net/metrics/DhcpErrorEvent;->DHCP_INVALID_OPTION_LENGTH:I
-Landroid/net/metrics/DhcpErrorEvent;->DHCP_NO_COOKIE:I
-Landroid/net/metrics/DhcpErrorEvent;->DHCP_NO_MSG_TYPE:I
-Landroid/net/metrics/DhcpErrorEvent;->DHCP_UNKNOWN_MSG_TYPE:I
-Landroid/net/metrics/DhcpErrorEvent;->L2_TOO_SHORT:I
-Landroid/net/metrics/DhcpErrorEvent;->L2_WRONG_ETH_TYPE:I
-Landroid/net/metrics/DhcpErrorEvent;->L3_INVALID_IP:I
-Landroid/net/metrics/DhcpErrorEvent;->L3_NOT_IPV4:I
-Landroid/net/metrics/DhcpErrorEvent;->L3_TOO_SHORT:I
-Landroid/net/metrics/DhcpErrorEvent;->L4_NOT_UDP:I
-Landroid/net/metrics/DhcpErrorEvent;->L4_WRONG_PORT:I
-Landroid/net/metrics/DhcpErrorEvent;->PARSING_ERROR:I
-Landroid/net/metrics/DhcpErrorEvent;->RECEIVE_ERROR:I
-Landroid/net/metrics/DhcpErrorEvent;->errorCodeWithOption(II)I
-Landroid/net/metrics/IpConnectivityLog;-><init>()V
-Landroid/net/metrics/IpConnectivityLog;->log(Landroid/os/Parcelable;)Z
-Landroid/net/metrics/IpConnectivityLog;->log(Ljava/lang/String;Landroid/os/Parcelable;)Z
-Landroid/net/metrics/IpManagerEvent;-><init>(IJ)V
-Landroid/net/metrics/IpReachabilityEvent;-><init>(I)V
-Landroid/net/metrics/IpReachabilityEvent;->nudFailureEventType(ZZ)I
-Landroid/net/metrics/RaEvent$Builder;-><init>()V
-Landroid/net/metrics/RaEvent$Builder;->build()Landroid/net/metrics/RaEvent;
-Landroid/net/metrics/RaEvent$Builder;->updateDnsslLifetime(J)Landroid/net/metrics/RaEvent$Builder;
-Landroid/net/metrics/RaEvent$Builder;->updatePrefixPreferredLifetime(J)Landroid/net/metrics/RaEvent$Builder;
-Landroid/net/metrics/RaEvent$Builder;->updatePrefixValidLifetime(J)Landroid/net/metrics/RaEvent$Builder;
-Landroid/net/metrics/RaEvent$Builder;->updateRdnssLifetime(J)Landroid/net/metrics/RaEvent$Builder;
-Landroid/net/metrics/RaEvent$Builder;->updateRouteInfoLifetime(J)Landroid/net/metrics/RaEvent$Builder;
-Landroid/net/metrics/RaEvent$Builder;->updateRouterLifetime(J)Landroid/net/metrics/RaEvent$Builder;
-Landroid/net/sip/SipProfile;->readResolve()Ljava/lang/Object;
-Landroid/net/sip/SipProfile;->serialVersionUID:J
-Landroid/net/wifi/BatchedScanResult;
-Landroid/net/wifi/BatchedScanResult;-><init>()V
-Landroid/net/wifi/BatchedScanResult;-><init>(Landroid/net/wifi/BatchedScanResult;)V
-Landroid/net/wifi/BatchedScanResult;->scanResults:Ljava/util/List;
-Landroid/net/wifi/BatchedScanResult;->truncated:Z
-Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager;
-Landroid/net/wifi/IWifiScanner$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/net/wifi/IWifiScanner$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/net/wifi/IWifiScanner$Stub;-><init>()V
-Landroid/net/wifi/IWifiScanner$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiScanner;
-Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_OPERATION:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_INTERWORKING:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_ROAMING_CONSORTIUM:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_RSN:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_SSID:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_SUPPORTED_RATES:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_TIM:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_VHT_OPERATION:I
-Landroid/net/wifi/ScanResult$InformationElement;->EID_VSA:I
-Landroid/net/wifi/ScanResult$InformationElement;->bytes:[B
-Landroid/net/wifi/ScanResult$InformationElement;->id:I
-Landroid/net/wifi/ScanResult;->anqpDomainId:I
-Landroid/net/wifi/ScanResult;->anqpLines:Ljava/util/List;
-Landroid/net/wifi/ScanResult;->distanceCm:I
-Landroid/net/wifi/ScanResult;->distanceSdCm:I
-Landroid/net/wifi/ScanResult;->flags:J
-Landroid/net/wifi/ScanResult;->hessid:J
-Landroid/net/wifi/ScanResult;->informationElements:[Landroid/net/wifi/ScanResult$InformationElement;
-Landroid/net/wifi/ScanResult;->numUsage:I
-Landroid/net/wifi/ScanResult;->seen:J
-Landroid/net/wifi/ScanResult;->untrusted:Z
-Landroid/net/wifi/ScanResult;->wifiSsid:Landroid/net/wifi/WifiSsid;
-Landroid/net/wifi/WifiConfiguration;->apBand:I
-Landroid/net/wifi/WifiConfiguration;->apChannel:I
-Landroid/net/wifi/WifiConfiguration;->defaultGwMacAddress:Ljava/lang/String;
-Landroid/net/wifi/WifiConfiguration;->lastConnectUid:I
-Landroid/net/wifi/WifiConfiguration;->mIpConfiguration:Landroid/net/IpConfiguration;
-Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V
-Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V
-Landroid/net/wifi/WifiConfiguration;->validatedInternetAccess:Z
-Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;
-Landroid/net/wifi/WifiEnterpriseConfig;->getClientCertificateAlias()Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->DEFAULT_MAC_ADDRESS:Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->getMeteredHint()Z
-Landroid/net/wifi/WifiInfo;->getWifiSsid()Landroid/net/wifi/WifiSsid;
-Landroid/net/wifi/WifiInfo;->is5GHz()Z
-Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->score:I
-Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V
-Landroid/net/wifi/WifiManager;->connect(ILandroid/net/wifi/WifiManager$ActionListener;)V
-Landroid/net/wifi/WifiManager;->forget(ILandroid/net/wifi/WifiManager$ActionListener;)V
-Landroid/net/wifi/WifiManager;->isDualBandSupported()Z
-Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;
-Landroid/net/wifi/WifiManager;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/WifiManager$ActionListener;)V
-Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;
-Landroid/net/wifi/WifiSsid;->getOctets()[B
-Landroid/net/wifi/p2p/WifiP2pGroup;->TEMPORARY_NET_ID:I
-Landroid/net/wifi/p2p/WifiP2pGroup;->getNetworkId()I
-Landroid/net/wifi/p2p/WifiP2pGroupList;->getGroupList()Ljava/util/Collection;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mAsyncChannel:Lcom/android/internal/util/AsyncChannel;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->putListener(Ljava/lang/Object;)I
-Landroid/net/wifi/p2p/WifiP2pManager;->CREATE_GROUP:I
-Landroid/net/wifi/p2p/WifiP2pManager;->deletePersistentGroup(Landroid/net/wifi/p2p/WifiP2pManager$Channel;ILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V
-Landroid/net/wifi/p2p/WifiP2pManager;->requestPersistentGroupInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$PersistentGroupInfoListener;)V
-Landroid/net/wifi/p2p/WifiP2pManager;->setDeviceName(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V
-Landroid/net/wifi/p2p/WifiP2pManager;->setWifiP2pChannels(Landroid/net/wifi/p2p/WifiP2pManager$Channel;IILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V
-Landroid/nfc/NfcAdapter;->getAdapterState()I
-Landroid/nfc/NfcAdapter;->getDefaultAdapter()Landroid/nfc/NfcAdapter;
-Landroid/nfc/NfcAdapter;->getNfcAdapter(Landroid/content/Context;)Landroid/nfc/NfcAdapter;
-Landroid/nfc/NfcAdapter;->setNdefPushMessageCallback(Landroid/nfc/NfcAdapter$CreateNdefMessageCallback;Landroid/app/Activity;I)V
-Landroid/opengl/GLSurfaceView$EglHelper;->mEglContext:Ljavax/microedition/khronos/egl/EGLContext;
-Landroid/opengl/GLSurfaceView$GLThread;->mEglHelper:Landroid/opengl/GLSurfaceView$EglHelper;
-Landroid/opengl/GLSurfaceView;->mGLThread:Landroid/opengl/GLSurfaceView$GLThread;
-Landroid/opengl/GLSurfaceView;->mRenderer:Landroid/opengl/GLSurfaceView$Renderer;
-Landroid/os/AsyncResult;-><init>(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Throwable;)V
-Landroid/os/AsyncResult;->exception:Ljava/lang/Throwable;
-Landroid/os/AsyncResult;->forMessage(Landroid/os/Message;Ljava/lang/Object;Ljava/lang/Throwable;)Landroid/os/AsyncResult;
-Landroid/os/AsyncResult;->result:Ljava/lang/Object;
-Landroid/os/AsyncResult;->userObj:Ljava/lang/Object;
-Landroid/os/AsyncTask;->mFuture:Ljava/util/concurrent/FutureTask;
-Landroid/os/AsyncTask;->mStatus:Landroid/os/AsyncTask$Status;
-Landroid/os/AsyncTask;->mTaskInvoked:Ljava/util/concurrent/atomic/AtomicBoolean;
-Landroid/os/AsyncTask;->mWorker:Landroid/os/AsyncTask$WorkerRunnable;
-Landroid/os/AsyncTask;->sDefaultExecutor:Ljava/util/concurrent/Executor;
-Landroid/os/AsyncTask;->setDefaultExecutor(Ljava/util/concurrent/Executor;)V
-Landroid/os/BatteryManager;-><init>()V
-Landroid/os/BatteryStats$Counter;->getCountLocked(I)I
-Landroid/os/BatteryStats$HistoryItem;-><init>()V
-Landroid/os/BatteryStats$HistoryItem;->CMD_UPDATE:B
-Landroid/os/BatteryStats$HistoryItem;->batteryLevel:B
-Landroid/os/BatteryStats$HistoryItem;->cmd:B
-Landroid/os/BatteryStats$HistoryItem;->states2:I
-Landroid/os/BatteryStats$HistoryItem;->states:I
-Landroid/os/BatteryStats$HistoryItem;->time:J
-Landroid/os/BatteryStats$Timer;->getCountLocked(I)I
-Landroid/os/BatteryStats$Timer;->getTotalTimeLocked(JI)J
-Landroid/os/BatteryStats$Uid$Pkg$Serv;->getLaunches(I)I
-Landroid/os/BatteryStats$Uid$Pkg$Serv;->getStartTime(JI)J
-Landroid/os/BatteryStats$Uid$Pkg;->getServiceStats()Landroid/util/ArrayMap;
-Landroid/os/BatteryStats$Uid$Pkg;->getWakeupAlarmStats()Landroid/util/ArrayMap;
-Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->overTime:J
-Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->type:I
-Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->usedTime:J
-Landroid/os/BatteryStats$Uid$Proc;->countExcessivePowers()I
-Landroid/os/BatteryStats$Uid$Proc;->getExcessivePower(I)Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;
-Landroid/os/BatteryStats$Uid$Proc;->getForegroundTime(I)J
-Landroid/os/BatteryStats$Uid$Proc;->getStarts(I)I
-Landroid/os/BatteryStats$Uid$Proc;->getSystemTime(I)J
-Landroid/os/BatteryStats$Uid$Proc;->getUserTime(I)J
-Landroid/os/BatteryStats$Uid$Sensor;->getHandle()I
-Landroid/os/BatteryStats$Uid$Sensor;->getSensorTime()Landroid/os/BatteryStats$Timer;
-Landroid/os/BatteryStats$Uid$Wakelock;->getWakeTime(I)Landroid/os/BatteryStats$Timer;
-Landroid/os/BatteryStats$Uid;-><init>()V
-Landroid/os/BatteryStats$Uid;->getAudioTurnedOnTimer()Landroid/os/BatteryStats$Timer;
-Landroid/os/BatteryStats$Uid;->getFullWifiLockTime(JI)J
-Landroid/os/BatteryStats$Uid;->getPackageStats()Landroid/util/ArrayMap;
-Landroid/os/BatteryStats$Uid;->getProcessStats()Landroid/util/ArrayMap;
-Landroid/os/BatteryStats$Uid;->getSensorStats()Landroid/util/SparseArray;
-Landroid/os/BatteryStats$Uid;->getUid()I
-Landroid/os/BatteryStats$Uid;->getVideoTurnedOnTimer()Landroid/os/BatteryStats$Timer;
-Landroid/os/BatteryStats$Uid;->getWifiMulticastTime(JI)J
-Landroid/os/BatteryStats$Uid;->getWifiRunningTime(JI)J
-Landroid/os/BatteryStats$Uid;->getWifiScanTime(JI)J
-Landroid/os/BatteryStats;->NUM_DATA_CONNECTION_TYPES:I
-Landroid/os/BatteryStats;->getNextHistoryLocked(Landroid/os/BatteryStats$HistoryItem;)Z
-Landroid/os/BatteryStats;->getUidStats()Landroid/util/SparseArray;
-Landroid/os/BatteryStats;->startIteratingHistoryLocked()Z
-Landroid/os/Binder;->execTransact(IJJI)Z
-Landroid/os/Binder;->mObject:J
-Landroid/os/Broadcaster;-><init>()V
-Landroid/os/Broadcaster;->broadcast(Landroid/os/Message;)V
-Landroid/os/Broadcaster;->cancelRequest(ILandroid/os/Handler;I)V
-Landroid/os/Broadcaster;->request(ILandroid/os/Handler;I)V
-Landroid/os/Build$VERSION;->ACTIVE_CODENAMES:[Ljava/lang/String;
-Landroid/os/Build;->IS_DEBUGGABLE:Z
-Landroid/os/Build;->IS_EMULATOR:Z
-Landroid/os/Build;->PERMISSIONS_REVIEW_REQUIRED:Z
-Landroid/os/Build;->getString(Ljava/lang/String;)Ljava/lang/String;
-Landroid/os/Bundle;->getIBinder(Ljava/lang/String;)Landroid/os/IBinder;
-Landroid/os/Bundle;->putIBinder(Ljava/lang/String;Landroid/os/IBinder;)V
-Landroid/os/Debug$MemoryInfo;->NUM_DVK_STATS:I
-Landroid/os/Debug$MemoryInfo;->NUM_OTHER_STATS:I
-Landroid/os/Debug$MemoryInfo;->dalvikPrivateClean:I
-Landroid/os/Debug$MemoryInfo;->dalvikRss:I
-Landroid/os/Debug$MemoryInfo;->dalvikSharedClean:I
-Landroid/os/Debug$MemoryInfo;->dalvikSwappablePss:I
-Landroid/os/Debug$MemoryInfo;->dalvikSwappedOut:I
-Landroid/os/Debug$MemoryInfo;->dalvikSwappedOutPss:I
-Landroid/os/Debug$MemoryInfo;->getOtherLabel(I)Ljava/lang/String;
-Landroid/os/Debug$MemoryInfo;->getOtherPrivate(I)I
-Landroid/os/Debug$MemoryInfo;->getOtherPrivateDirty(I)I
-Landroid/os/Debug$MemoryInfo;->getOtherPss(I)I
-Landroid/os/Debug$MemoryInfo;->getOtherSharedDirty(I)I
-Landroid/os/Debug$MemoryInfo;->getTotalUss()I
-Landroid/os/Debug$MemoryInfo;->hasSwappedOutPss:Z
-Landroid/os/Debug$MemoryInfo;->nativePrivateClean:I
-Landroid/os/Debug$MemoryInfo;->nativeRss:I
-Landroid/os/Debug$MemoryInfo;->nativeSharedClean:I
-Landroid/os/Debug$MemoryInfo;->nativeSwappablePss:I
-Landroid/os/Debug$MemoryInfo;->nativeSwappedOut:I
-Landroid/os/Debug$MemoryInfo;->nativeSwappedOutPss:I
-Landroid/os/Debug$MemoryInfo;->otherPrivateClean:I
-Landroid/os/Debug$MemoryInfo;->otherRss:I
-Landroid/os/Debug$MemoryInfo;->otherSharedClean:I
-Landroid/os/Debug$MemoryInfo;->otherStats:[I
-Landroid/os/Debug$MemoryInfo;->otherSwappablePss:I
-Landroid/os/Debug$MemoryInfo;->otherSwappedOut:I
-Landroid/os/Debug$MemoryInfo;->otherSwappedOutPss:I
-Landroid/os/Debug;-><init>()V
-Landroid/os/Debug;->countInstancesOfClass(Ljava/lang/Class;)J
-Landroid/os/Debug;->dumpReferenceTables()V
-Landroid/os/DropBoxManager;->mService:Lcom/android/internal/os/IDropBoxManagerService;
-Landroid/os/Environment;->buildExternalStorageAppDataDirs(Ljava/lang/String;)[Ljava/io/File;
-Landroid/os/Environment;->getLegacyExternalStorageDirectory()Ljava/io/File;
-Landroid/os/Environment;->getStorageDirectory()Ljava/io/File;
-Landroid/os/Environment;->getVendorDirectory()Ljava/io/File;
-Landroid/os/Environment;->maybeTranslateEmulatedPathToInternal(Ljava/io/File;)Ljava/io/File;
-Landroid/os/FileObserver$ObserverThread;->onEvent(IILjava/lang/String;)V
-Landroid/os/FileUtils;->checksumCrc32(Ljava/io/File;)J
-Landroid/os/FileUtils;->copyFile(Ljava/io/File;Ljava/io/File;)Z
-Landroid/os/FileUtils;->copyToFile(Ljava/io/InputStream;Ljava/io/File;)Z
-Landroid/os/FileUtils;->deleteOlderFiles(Ljava/io/File;IJ)Z
-Landroid/os/FileUtils;->readTextFile(Ljava/io/File;ILjava/lang/String;)Ljava/lang/String;
-Landroid/os/FileUtils;->setPermissions(Ljava/io/File;III)I
-Landroid/os/FileUtils;->setPermissions(Ljava/io/FileDescriptor;III)I
-Landroid/os/FileUtils;->setPermissions(Ljava/lang/String;III)I
-Landroid/os/FileUtils;->stringToFile(Ljava/io/File;Ljava/lang/String;)V
-Landroid/os/FileUtils;->stringToFile(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/os/FileUtils;->sync(Ljava/io/FileOutputStream;)Z
-Landroid/os/Handler;-><init>(Landroid/os/Looper;Landroid/os/Handler$Callback;Z)V
-Landroid/os/Handler;-><init>(Z)V
-Landroid/os/Handler;->getIMessenger()Landroid/os/IMessenger;
-Landroid/os/Handler;->getMain()Landroid/os/Handler;
-Landroid/os/Handler;->hasCallbacks(Ljava/lang/Runnable;)Z
-Landroid/os/Handler;->mCallback:Landroid/os/Handler$Callback;
-Landroid/os/Handler;->mMessenger:Landroid/os/IMessenger;
-Landroid/os/HwBinder;->reportSyspropChanged()V
-Landroid/os/HwParcel;-><init>(Z)V
-Landroid/os/HwRemoteBinder;-><init>()V
-Landroid/os/IBatteryPropertiesRegistrar$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/os/INetworkManagementService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/INetworkManagementService;
-Landroid/os/INetworkManagementService;->clearInterfaceAddresses(Ljava/lang/String;)V
-Landroid/os/INetworkManagementService;->disableIpv6(Ljava/lang/String;)V
-Landroid/os/INetworkManagementService;->enableIpv6(Ljava/lang/String;)V
-Landroid/os/INetworkManagementService;->isBandwidthControlEnabled()Z
-Landroid/os/INetworkManagementService;->registerObserver(Landroid/net/INetworkManagementEventObserver;)V
-Landroid/os/INetworkManagementService;->setIPv6AddrGenMode(Ljava/lang/String;I)V
-Landroid/os/INetworkManagementService;->setInterfaceConfig(Ljava/lang/String;Landroid/net/InterfaceConfiguration;)V
-Landroid/os/INetworkManagementService;->setInterfaceIpv6PrivacyExtensions(Ljava/lang/String;Z)V
-Landroid/os/INetworkManagementService;->unregisterObserver(Landroid/net/INetworkManagementEventObserver;)V
-Landroid/os/IPermissionController$Stub$Proxy;->checkPermission(Ljava/lang/String;II)Z
-Landroid/os/IPermissionController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPermissionController;
-Landroid/os/IPowerManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/os/IPowerManager$Stub$Proxy;->isLightDeviceIdleMode()Z
-Landroid/os/IPowerManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPowerManager;
-Landroid/os/IPowerManager;->goToSleep(JII)V
-Landroid/os/IPowerManager;->reboot(ZLjava/lang/String;Z)V
-Landroid/os/IPowerManager;->releaseWakeLock(Landroid/os/IBinder;I)V
-Landroid/os/IPowerManager;->userActivity(JII)V
-Landroid/os/IRecoverySystem$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IRecoverySystem;
-Landroid/os/IRemoteCallback$Stub;-><init>()V
-Landroid/os/IServiceManager;->checkService(Ljava/lang/String;)Landroid/os/IBinder;
-Landroid/os/IServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder;
-Landroid/os/IUserManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/os/IUserManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IUserManager;
-Landroid/os/IVibratorService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IVibratorService;
-Landroid/os/LocaleList;->setDefault(Landroid/os/LocaleList;I)V
-Landroid/os/Looper;->mQueue:Landroid/os/MessageQueue;
-Landroid/os/Looper;->sThreadLocal:Ljava/lang/ThreadLocal;
-Landroid/os/Looper;->setTraceTag(J)V
-Landroid/os/MemoryFile;->getFileDescriptor()Ljava/io/FileDescriptor;
-Landroid/os/Message;->callback:Ljava/lang/Runnable;
-Landroid/os/Message;->flags:I
-Landroid/os/Message;->markInUse()V
-Landroid/os/Message;->next:Landroid/os/Message;
-Landroid/os/Message;->recycleUnchecked()V
-Landroid/os/Message;->setCallback(Ljava/lang/Runnable;)Landroid/os/Message;
-Landroid/os/Message;->target:Landroid/os/Handler;
-Landroid/os/Message;->when:J
-Landroid/os/MessageQueue;->dispatchEvents(II)I
-Landroid/os/MessageQueue;->mIdleHandlers:Ljava/util/ArrayList;
-Landroid/os/MessageQueue;->mMessages:Landroid/os/Message;
-Landroid/os/MessageQueue;->mPtr:J
-Landroid/os/MessageQueue;->mQuitAllowed:Z
-Landroid/os/MessageQueue;->nativePollOnce(JI)V
-Landroid/os/MessageQueue;->next()Landroid/os/Message;
-Landroid/os/MessageQueue;->postSyncBarrier()I
-Landroid/os/MessageQueue;->removeSyncBarrier(I)V
-Landroid/os/Parcel$ReadWriteHelper;-><init>()V
-Landroid/os/Parcel;->mNativePtr:J
-Landroid/os/Parcel;->readArrayMap(Landroid/util/ArrayMap;Ljava/lang/ClassLoader;)V
-Landroid/os/Parcel;->readBlob()[B
-Landroid/os/Parcel;->readParcelableList(Ljava/util/List;Ljava/lang/ClassLoader;)Ljava/util/List;
-Landroid/os/Parcel;->readStringArray()[Ljava/lang/String;
-Landroid/os/Parcel;->writeArrayMap(Landroid/util/ArrayMap;)V
-Landroid/os/Parcel;->writeBlob([B)V
-Landroid/os/Parcel;->writeParcelableList(Ljava/util/List;I)V
-Landroid/os/ParcelFileDescriptor$FileDescriptorDetachedException;->serialVersionUID:J
-Landroid/os/ParcelFileDescriptor;-><init>(Ljava/io/FileDescriptor;)V
-Landroid/os/ParcelFileDescriptor;->fromData([BLjava/lang/String;)Landroid/os/ParcelFileDescriptor;
-Landroid/os/PowerManager;->ACTION_SCREEN_BRIGHTNESS_BOOST_CHANGED:Ljava/lang/String;
-Landroid/os/PowerManager;->getDefaultScreenBrightnessSetting()I
-Landroid/os/PowerManager;->getMaximumScreenBrightnessSetting()I
-Landroid/os/PowerManager;->getMinimumScreenBrightnessSetting()I
-Landroid/os/PowerManager;->goToSleep(J)V
-Landroid/os/PowerManager;->isLightDeviceIdleMode()Z
-Landroid/os/PowerManager;->isScreenBrightnessBoosted()Z
-Landroid/os/PowerManager;->mService:Landroid/os/IPowerManager;
-Landroid/os/PowerManager;->userActivity(JZ)V
-Landroid/os/PowerManager;->validateWakeLockParameters(ILjava/lang/String;)V
-Landroid/os/PowerManager;->wakeUp(J)V
-Landroid/os/PowerManager;->wakeUp(JLjava/lang/String;)V
-Landroid/os/Process;->getFreeMemory()J
-Landroid/os/Process;->getParentPid(I)I
-Landroid/os/Process;->getPids(Ljava/lang/String;[I)[I
-Landroid/os/Process;->getTotalMemory()J
-Landroid/os/Process;->getUidForPid(I)I
-Landroid/os/Process;->isIsolated(I)Z
-Landroid/os/Process;->readProcFile(Ljava/lang/String;[I[Ljava/lang/String;[J[F)Z
-Landroid/os/Process;->readProcLines(Ljava/lang/String;[Ljava/lang/String;[J)V
-Landroid/os/Process;->setArgV0(Ljava/lang/String;)V
-Landroid/os/RecoverySystem;-><init>()V
-Landroid/os/Registrant;-><init>(Landroid/os/Handler;ILjava/lang/Object;)V
-Landroid/os/Registrant;->clear()V
-Landroid/os/Registrant;->notifyRegistrant()V
-Landroid/os/Registrant;->notifyRegistrant(Landroid/os/AsyncResult;)V
-Landroid/os/RegistrantList;-><init>()V
-Landroid/os/RegistrantList;->add(Landroid/os/Registrant;)V
-Landroid/os/RegistrantList;->addUnique(Landroid/os/Handler;ILjava/lang/Object;)V
-Landroid/os/RegistrantList;->notifyRegistrants()V
-Landroid/os/RegistrantList;->notifyRegistrants(Landroid/os/AsyncResult;)V
-Landroid/os/RegistrantList;->remove(Landroid/os/Handler;)V
-Landroid/os/RegistrantList;->removeCleared()V
-Landroid/os/RemoteException;->rethrowFromSystemServer()Ljava/lang/RuntimeException;
-Landroid/os/SELinux;->checkSELinuxAccess(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
-Landroid/os/SELinux;->getFileContext(Ljava/lang/String;)Ljava/lang/String;
-Landroid/os/SELinux;->getPidContext(I)Ljava/lang/String;
-Landroid/os/SELinux;->isSELinuxEnabled()Z
-Landroid/os/SELinux;->isSELinuxEnforced()Z
-Landroid/os/ServiceManager;-><init>()V
-Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
-Landroid/os/ServiceManager;->checkService(Ljava/lang/String;)Landroid/os/IBinder;
-Landroid/os/ServiceManager;->getIServiceManager()Landroid/os/IServiceManager;
-Landroid/os/ServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder;
-Landroid/os/ServiceManager;->listServices()[Ljava/lang/String;
-Landroid/os/ServiceManager;->sCache:Ljava/util/HashMap;
-Landroid/os/ServiceManager;->sServiceManager:Landroid/os/IServiceManager;
-Landroid/os/ServiceManagerNative;->asInterface(Landroid/os/IBinder;)Landroid/os/IServiceManager;
-Landroid/os/ServiceSpecificException;->errorCode:I
-Landroid/os/SharedMemory;->getFd()I
-Landroid/os/StrictMode$Span;->finish()V
-Landroid/os/StrictMode$ThreadPolicy$Builder;->penaltyListener(Landroid/os/StrictMode$OnThreadViolationListener;Ljava/util/concurrent/Executor;)Landroid/os/StrictMode$ThreadPolicy$Builder;
-Landroid/os/StrictMode$VmPolicy$Builder;->penaltyListener(Landroid/os/StrictMode$OnVmViolationListener;Ljava/util/concurrent/Executor;)Landroid/os/StrictMode$VmPolicy$Builder;
-Landroid/os/StrictMode;->conditionallyCheckInstanceCounts()V
-Landroid/os/StrictMode;->disableDeathOnFileUriExposure()V
-Landroid/os/StrictMode;->enterCriticalSpan(Ljava/lang/String;)Landroid/os/StrictMode$Span;
-Landroid/os/StrictMode;->getThreadPolicyMask()I
-Landroid/os/StrictMode;->onBinderStrictModePolicyChange(I)V
-Landroid/os/StrictMode;->violationsBeingTimed:Ljava/lang/ThreadLocal;
-Landroid/os/SystemClock;->elapsedRealtimeClock()Ljava/time/Clock;
-Landroid/os/SystemClock;->uptimeClock()Ljava/time/Clock;
-Landroid/os/SystemClock;->uptimeMillisClock()Ljava/time/Clock;
-Landroid/os/SystemProperties;-><init>()V
-Landroid/os/SystemProperties;->PROP_NAME_MAX:I
-Landroid/os/SystemProperties;->addChangeCallback(Ljava/lang/Runnable;)V
-Landroid/os/SystemProperties;->native_get(Ljava/lang/String;)Ljava/lang/String;
-Landroid/os/SystemProperties;->reportSyspropChanged()V
-Landroid/os/SystemProperties;->set(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/os/SystemService;->start(Ljava/lang/String;)V
-Landroid/os/SystemService;->stop(Ljava/lang/String;)V
-Landroid/os/SystemVibrator;-><init>()V
-Landroid/os/TestLooperManager;->getQueue()Landroid/os/MessageQueue;
-Landroid/os/Trace;->TRACE_TAG_APP:J
-Landroid/os/Trace;->TRACE_TAG_VIEW:J
-Landroid/os/Trace;->asyncTraceBegin(JLjava/lang/String;I)V
-Landroid/os/Trace;->asyncTraceEnd(JLjava/lang/String;I)V
-Landroid/os/Trace;->isTagEnabled(J)Z
-Landroid/os/Trace;->setAppTracingAllowed(Z)V
-Landroid/os/Trace;->traceBegin(JLjava/lang/String;)V
-Landroid/os/Trace;->traceCounter(JLjava/lang/String;I)V
-Landroid/os/Trace;->traceEnd(J)V
-Landroid/os/UpdateLock;->NOW_IS_CONVENIENT:Ljava/lang/String;
-Landroid/os/UpdateLock;->TIMESTAMP:Ljava/lang/String;
-Landroid/os/UpdateLock;->UPDATE_LOCK_CHANGED:Ljava/lang/String;
-Landroid/os/UpdateLock;->acquire()V
-Landroid/os/UpdateLock;->isHeld()Z
-Landroid/os/UpdateLock;->release()V
-Landroid/os/UserHandle;-><init>(I)V
-Landroid/os/UserHandle;->AID_APP_END:I
-Landroid/os/UserHandle;->AID_APP_START:I
-Landroid/os/UserHandle;->AID_CACHE_GID_START:I
-Landroid/os/UserHandle;->AID_ROOT:I
-Landroid/os/UserHandle;->AID_SHARED_GID_START:I
-Landroid/os/UserHandle;->ALL:Landroid/os/UserHandle;
-Landroid/os/UserHandle;->CURRENT:Landroid/os/UserHandle;
-Landroid/os/UserHandle;->CURRENT_OR_SELF:Landroid/os/UserHandle;
-Landroid/os/UserHandle;->ERR_GID:I
-Landroid/os/UserHandle;->MU_ENABLED:Z
-Landroid/os/UserHandle;->OWNER:Landroid/os/UserHandle;
-Landroid/os/UserHandle;->PER_USER_RANGE:I
-Landroid/os/UserHandle;->USER_ALL:I
-Landroid/os/UserHandle;->USER_CURRENT:I
-Landroid/os/UserHandle;->USER_CURRENT_OR_SELF:I
-Landroid/os/UserHandle;->USER_NULL:I
-Landroid/os/UserHandle;->USER_OWNER:I
-Landroid/os/UserHandle;->USER_SERIAL_SYSTEM:I
-Landroid/os/UserHandle;->USER_SYSTEM:I
-Landroid/os/UserHandle;->getAppIdFromSharedAppGid(I)I
-Landroid/os/UserHandle;->getCallingUserId()I
-Landroid/os/UserHandle;->getUid(II)I
-Landroid/os/UserHandle;->getUserId(I)I
-Landroid/os/UserHandle;->isSameApp(II)Z
-Landroid/os/UserManager;->get(Landroid/content/Context;)Landroid/os/UserManager;
-Landroid/os/UserManager;->getBadgedDrawableForUser(Landroid/graphics/drawable/Drawable;Landroid/os/UserHandle;Landroid/graphics/Rect;I)Landroid/graphics/drawable/Drawable;
-Landroid/os/UserManager;->getBadgedIconForUser(Landroid/graphics/drawable/Drawable;Landroid/os/UserHandle;)Landroid/graphics/drawable/Drawable;
-Landroid/os/UserManager;->getBadgedLabelForUser(Ljava/lang/CharSequence;Landroid/os/UserHandle;)Ljava/lang/CharSequence;
-Landroid/os/UserManager;->getMaxSupportedUsers()I
-Landroid/os/UserManager;->getProfiles(I)Ljava/util/List;
-Landroid/os/UserManager;->getUserHandle()I
-Landroid/os/UserManager;->getUserHandle(I)I
-Landroid/os/UserManager;->getUserIcon(I)Landroid/graphics/Bitmap;
-Landroid/os/UserManager;->getUserInfo(I)Landroid/content/pm/UserInfo;
-Landroid/os/UserManager;->getUserSerialNumber(I)I
-Landroid/os/UserManager;->getUserStartRealtime()J
-Landroid/os/UserManager;->getUserUnlockRealtime()J
-Landroid/os/UserManager;->getUsers()Ljava/util/List;
-Landroid/os/UserManager;->hasBaseUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z
-Landroid/os/UserManager;->hasUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z
-Landroid/os/UserManager;->isAdminUser()Z
-Landroid/os/UserManager;->isLinkedUser()Z
-Landroid/os/UserManager;->isUserUnlocked(I)Z
-Landroid/os/UserManager;->mService:Landroid/os/IUserManager;
-Landroid/os/VintfObject;->getHalNamesAndVersions()[Ljava/lang/String;
-Landroid/os/VintfObject;->getSepolicyVersion()Ljava/lang/String;
-Landroid/os/VintfObject;->getTargetFrameworkCompatibilityMatrixVersion()Ljava/lang/Long;
-Landroid/os/VintfObject;->getVndkSnapshots()Ljava/util/Map;
-Landroid/os/VintfObject;->report()[Ljava/lang/String;
-Landroid/os/VintfRuntimeInfo;->getCpuInfo()Ljava/lang/String;
-Landroid/os/VintfRuntimeInfo;->getHardwareId()Ljava/lang/String;
-Landroid/os/VintfRuntimeInfo;->getKernelVersion()Ljava/lang/String;
-Landroid/os/VintfRuntimeInfo;->getNodeName()Ljava/lang/String;
-Landroid/os/VintfRuntimeInfo;->getOsName()Ljava/lang/String;
-Landroid/os/VintfRuntimeInfo;->getOsRelease()Ljava/lang/String;
-Landroid/os/VintfRuntimeInfo;->getOsVersion()Ljava/lang/String;
-Landroid/os/WorkSource;-><init>(I)V
-Landroid/os/WorkSource;->add(I)Z
-Landroid/os/WorkSource;->add(ILjava/lang/String;)Z
-Landroid/os/WorkSource;->addReturningNewbs(Landroid/os/WorkSource;)Landroid/os/WorkSource;
-Landroid/os/WorkSource;->get(I)I
-Landroid/os/WorkSource;->getName(I)Ljava/lang/String;
-Landroid/os/WorkSource;->mNames:[Ljava/lang/String;
-Landroid/os/WorkSource;->mNum:I
-Landroid/os/WorkSource;->mUids:[I
-Landroid/os/WorkSource;->setReturningDiffs(Landroid/os/WorkSource;)[Landroid/os/WorkSource;
-Landroid/os/WorkSource;->size()I
-Landroid/os/health/HealthKeys$Constants;-><init>(Ljava/lang/Class;)V
-Landroid/os/health/HealthStats;-><init>(Landroid/os/Parcel;)V
-Landroid/os/health/HealthStatsParceler;-><init>(Landroid/os/Parcel;)V
-Landroid/os/health/HealthStatsParceler;-><init>(Landroid/os/health/HealthStatsWriter;)V
-Landroid/os/health/HealthStatsParceler;->getHealthStats()Landroid/os/health/HealthStats;
-Landroid/os/health/HealthStatsWriter;-><init>(Landroid/os/health/HealthKeys$Constants;)V
-Landroid/os/health/HealthStatsWriter;->addMeasurement(IJ)V
-Landroid/os/health/HealthStatsWriter;->addMeasurements(ILjava/lang/String;J)V
-Landroid/os/health/HealthStatsWriter;->addStats(ILjava/lang/String;Landroid/os/health/HealthStatsWriter;)V
-Landroid/os/health/HealthStatsWriter;->addTimer(IIJ)V
-Landroid/os/health/HealthStatsWriter;->addTimers(ILjava/lang/String;Landroid/os/health/TimerStat;)V
-Landroid/os/health/HealthStatsWriter;->flattenToParcel(Landroid/os/Parcel;)V
-Landroid/os/health/SystemHealthManager;->from(Landroid/content/Context;)Landroid/os/health/SystemHealthManager;
-Landroid/os/storage/DiskInfo;->getDescription()Ljava/lang/String;
-Landroid/os/storage/DiskInfo;->getId()Ljava/lang/String;
-Landroid/os/storage/DiskInfo;->isSd()Z
-Landroid/os/storage/DiskInfo;->isUsb()Z
-Landroid/os/storage/IStorageManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/os/storage/IStorageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IStorageManager;
-Landroid/os/storage/StorageEventListener;-><init>()V
-Landroid/os/storage/StorageManager;->findVolumeById(Ljava/lang/String;)Landroid/os/storage/VolumeInfo;
-Landroid/os/storage/StorageManager;->findVolumeByUuid(Ljava/lang/String;)Landroid/os/storage/VolumeInfo;
-Landroid/os/storage/StorageManager;->from(Landroid/content/Context;)Landroid/os/storage/StorageManager;
-Landroid/os/storage/StorageManager;->getBestVolumeDescription(Landroid/os/storage/VolumeInfo;)Ljava/lang/String;
-Landroid/os/storage/StorageManager;->getDisks()Ljava/util/List;
-Landroid/os/storage/StorageManager;->getPrimaryVolume()Landroid/os/storage/StorageVolume;
-Landroid/os/storage/StorageManager;->getStorageBytesUntilLow(Ljava/io/File;)J
-Landroid/os/storage/StorageManager;->getStorageFullBytes(Ljava/io/File;)J
-Landroid/os/storage/StorageManager;->getStorageLowBytes(Ljava/io/File;)J
-Landroid/os/storage/StorageManager;->getVolumeList()[Landroid/os/storage/StorageVolume;
-Landroid/os/storage/StorageManager;->getVolumeList(II)[Landroid/os/storage/StorageVolume;
-Landroid/os/storage/StorageManager;->getVolumePaths()[Ljava/lang/String;
-Landroid/os/storage/StorageManager;->getVolumeState(Ljava/lang/String;)Ljava/lang/String;
-Landroid/os/storage/StorageManager;->getVolumes()Ljava/util/List;
-Landroid/os/storage/StorageManager;->registerListener(Landroid/os/storage/StorageEventListener;)V
-Landroid/os/storage/StorageManager;->unregisterListener(Landroid/os/storage/StorageEventListener;)V
-Landroid/os/storage/StorageVolume;->allowMassStorage()Z
-Landroid/os/storage/StorageVolume;->getId()Ljava/lang/String;
-Landroid/os/storage/StorageVolume;->getMaxFileSize()J
-Landroid/os/storage/StorageVolume;->getPath()Ljava/lang/String;
-Landroid/os/storage/StorageVolume;->getPathFile()Ljava/io/File;
-Landroid/os/storage/StorageVolume;->getUserLabel()Ljava/lang/String;
-Landroid/os/storage/StorageVolume;->mPath:Ljava/io/File;
-Landroid/os/storage/VolumeInfo;->TYPE_EMULATED:I
-Landroid/os/storage/VolumeInfo;->TYPE_PUBLIC:I
-Landroid/os/storage/VolumeInfo;->buildStorageVolume(Landroid/content/Context;IZ)Landroid/os/storage/StorageVolume;
-Landroid/os/storage/VolumeInfo;->getDisk()Landroid/os/storage/DiskInfo;
-Landroid/os/storage/VolumeInfo;->getEnvironmentForState(I)Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->getFsUuid()Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->getId()Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->getPath()Ljava/io/File;
-Landroid/os/storage/VolumeInfo;->getState()I
-Landroid/os/storage/VolumeInfo;->getType()I
-Landroid/os/storage/VolumeInfo;->isPrimary()Z
-Landroid/os/storage/VolumeInfo;->isVisible()Z
-Landroid/permissionpresenterservice/RuntimePermissionPresenterService;->onRevokeRuntimePermission(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/preference/DialogPreference;->mBuilder:Landroid/app/AlertDialog$Builder;
-Landroid/preference/DialogPreference;->mDialog:Landroid/app/Dialog;
-Landroid/preference/DialogPreference;->mDialogIcon:Landroid/graphics/drawable/Drawable;
-Landroid/preference/DialogPreference;->mDialogMessage:Ljava/lang/CharSequence;
-Landroid/preference/DialogPreference;->mDialogTitle:Ljava/lang/CharSequence;
-Landroid/preference/DialogPreference;->mNegativeButtonText:Ljava/lang/CharSequence;
-Landroid/preference/DialogPreference;->mPositiveButtonText:Ljava/lang/CharSequence;
-Landroid/preference/DialogPreference;->mWhichButtonClicked:I
-Landroid/preference/ListPreference;->mClickedDialogEntryIndex:I
-Landroid/preference/Preference;->onKey(Landroid/view/View;ILandroid/view/KeyEvent;)Z
-Landroid/preference/Preference;->performClick(Landroid/preference/PreferenceScreen;)V
-Landroid/preference/PreferenceActivity;->mPreferenceManager:Landroid/preference/PreferenceManager;
-Landroid/preference/PreferenceActivity;->mPrefsContainer:Landroid/view/ViewGroup;
-Landroid/preference/PreferenceManager;-><init>(Landroid/app/Activity;I)V
-Landroid/preference/PreferenceManager;-><init>(Landroid/content/Context;)V
-Landroid/preference/PreferenceManager;->dispatchActivityDestroy()V
-Landroid/preference/PreferenceManager;->dispatchActivityResult(IILandroid/content/Intent;)V
-Landroid/preference/PreferenceManager;->dispatchActivityStop()V
-Landroid/preference/PreferenceManager;->getEditor()Landroid/content/SharedPreferences$Editor;
-Landroid/preference/PreferenceManager;->getPreferenceScreen()Landroid/preference/PreferenceScreen;
-Landroid/preference/PreferenceManager;->inflateFromIntent(Landroid/content/Intent;Landroid/preference/PreferenceScreen;)Landroid/preference/PreferenceScreen;
-Landroid/preference/PreferenceManager;->inflateFromResource(Landroid/content/Context;ILandroid/preference/PreferenceScreen;)Landroid/preference/PreferenceScreen;
-Landroid/preference/PreferenceManager;->mActivityDestroyListeners:Ljava/util/List;
-Landroid/preference/PreferenceManager;->mOnPreferenceTreeClickListener:Landroid/preference/PreferenceManager$OnPreferenceTreeClickListener;
-Landroid/preference/PreferenceManager;->mSharedPreferences:Landroid/content/SharedPreferences;
-Landroid/preference/PreferenceManager;->registerOnActivityDestroyListener(Landroid/preference/PreferenceManager$OnActivityDestroyListener;)V
-Landroid/preference/PreferenceManager;->registerOnActivityStopListener(Landroid/preference/PreferenceManager$OnActivityStopListener;)V
-Landroid/preference/PreferenceManager;->setFragment(Landroid/preference/PreferenceFragment;)V
-Landroid/preference/PreferenceManager;->setPreferences(Landroid/preference/PreferenceScreen;)Z
-Landroid/preference/PreferenceManager;->shouldCommit()Z
-Landroid/preference/PreferenceManager;->unregisterOnActivityDestroyListener(Landroid/preference/PreferenceManager$OnActivityDestroyListener;)V
-Landroid/preference/PreferenceManager;->unregisterOnActivityStopListener(Landroid/preference/PreferenceManager$OnActivityStopListener;)V
-Landroid/preference/PreferenceScreen;->mRootAdapter:Landroid/widget/ListAdapter;
-Landroid/print/PrintDocumentAdapter$LayoutResultCallback;-><init>()V
-Landroid/print/PrintDocumentAdapter$WriteResultCallback;-><init>()V
-Landroid/print/PrintJobInfo;->getAdvancedOptions()Landroid/os/Bundle;
-Landroid/print/PrintJobInfo;->getDocumentInfo()Landroid/print/PrintDocumentInfo;
-Landroid/print/PrinterId;->getServiceName()Landroid/content/ComponentName;
-Landroid/provider/Browser$BookmarkColumns;
-Landroid/provider/Browser$BookmarkColumns;-><init>()V
-Landroid/provider/Browser$BookmarkColumns;->BOOKMARK:Ljava/lang/String;
-Landroid/provider/Browser$BookmarkColumns;->CREATED:Ljava/lang/String;
-Landroid/provider/Browser$BookmarkColumns;->DATE:Ljava/lang/String;
-Landroid/provider/Browser$BookmarkColumns;->FAVICON:Ljava/lang/String;
-Landroid/provider/Browser$BookmarkColumns;->TITLE:Ljava/lang/String;
-Landroid/provider/Browser$BookmarkColumns;->URL:Ljava/lang/String;
-Landroid/provider/Browser$BookmarkColumns;->VISITS:Ljava/lang/String;
-Landroid/provider/Browser$SearchColumns;
-Landroid/provider/Browser$SearchColumns;-><init>()V
-Landroid/provider/Browser$SearchColumns;->DATE:Ljava/lang/String;
-Landroid/provider/Browser$SearchColumns;->SEARCH:Ljava/lang/String;
-Landroid/provider/Browser$SearchColumns;->URL:Ljava/lang/String;
-Landroid/provider/Browser;->BOOKMARKS_URI:Landroid/net/Uri;
-Landroid/provider/Browser;->HISTORY_PROJECTION:[Ljava/lang/String;
-Landroid/provider/Browser;->HISTORY_PROJECTION_BOOKMARK_INDEX:I
-Landroid/provider/Browser;->HISTORY_PROJECTION_DATE_INDEX:I
-Landroid/provider/Browser;->HISTORY_PROJECTION_FAVICON_INDEX:I
-Landroid/provider/Browser;->HISTORY_PROJECTION_ID_INDEX:I
-Landroid/provider/Browser;->HISTORY_PROJECTION_TITLE_INDEX:I
-Landroid/provider/Browser;->HISTORY_PROJECTION_URL_INDEX:I
-Landroid/provider/Browser;->HISTORY_PROJECTION_VISITS_INDEX:I
-Landroid/provider/Browser;->SEARCHES_PROJECTION:[Ljava/lang/String;
-Landroid/provider/Browser;->SEARCHES_PROJECTION_DATE_INDEX:I
-Landroid/provider/Browser;->SEARCHES_PROJECTION_SEARCH_INDEX:I
-Landroid/provider/Browser;->SEARCHES_URI:Landroid/net/Uri;
-Landroid/provider/Browser;->TRUNCATE_HISTORY_PROJECTION:[Ljava/lang/String;
-Landroid/provider/Browser;->TRUNCATE_HISTORY_PROJECTION_ID_INDEX:I
-Landroid/provider/Browser;->TRUNCATE_N_OLDEST:I
-Landroid/provider/Browser;->addSearchUrl(Landroid/content/ContentResolver;Ljava/lang/String;)V
-Landroid/provider/Browser;->canClearHistory(Landroid/content/ContentResolver;)Z
-Landroid/provider/Browser;->clearHistory(Landroid/content/ContentResolver;)V
-Landroid/provider/Browser;->clearSearches(Landroid/content/ContentResolver;)V
-Landroid/provider/Browser;->deleteFromHistory(Landroid/content/ContentResolver;Ljava/lang/String;)V
-Landroid/provider/Browser;->deleteHistoryTimeFrame(Landroid/content/ContentResolver;JJ)V
-Landroid/provider/Browser;->getAllBookmarks(Landroid/content/ContentResolver;)Landroid/database/Cursor;
-Landroid/provider/Browser;->getAllVisitedUrls(Landroid/content/ContentResolver;)Landroid/database/Cursor;
-Landroid/provider/Browser;->getVisitedHistory(Landroid/content/ContentResolver;)[Ljava/lang/String;
-Landroid/provider/Browser;->requestAllIcons(Landroid/content/ContentResolver;Ljava/lang/String;Landroid/webkit/WebIconDatabase$IconListener;)V
-Landroid/provider/Browser;->saveBookmark(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
-Landroid/provider/Browser;->sendString(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
-Landroid/provider/Browser;->truncateHistory(Landroid/content/ContentResolver;)V
-Landroid/provider/Browser;->updateVisitedHistory(Landroid/content/ContentResolver;Ljava/lang/String;Z)V
-Landroid/provider/CalendarContract$CalendarAlerts;->findNextAlarmTime(Landroid/content/ContentResolver;J)J
-Landroid/provider/CalendarContract$CalendarAlerts;->rescheduleMissedAlarms(Landroid/content/ContentResolver;Landroid/content/Context;Landroid/app/AlarmManager;)V
-Landroid/provider/CalendarContract$Events;->PROVIDER_WRITABLE_COLUMNS:[Ljava/lang/String;
-Landroid/provider/ContactsContract$CommonDataKinds$Phone;->getDisplayLabel(Landroid/content/Context;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;
-Landroid/provider/ContactsContract$Contacts$StreamItems;
-Landroid/provider/ContactsContract$Contacts$StreamItems;->CONTENT_DIRECTORY:Ljava/lang/String;
-Landroid/provider/ContactsContract$RawContacts$StreamItems;
-Landroid/provider/ContactsContract$RawContacts$StreamItems;->CONTENT_DIRECTORY:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemPhotos;
-Landroid/provider/ContactsContract$StreamItemPhotos;->PHOTO:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemPhotosColumns;
-Landroid/provider/ContactsContract$StreamItemPhotosColumns;->PHOTO_FILE_ID:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemPhotosColumns;->PHOTO_URI:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SORT_INDEX:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemPhotosColumns;->STREAM_ITEM_ID:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SYNC1:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SYNC2:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SYNC3:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SYNC4:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItems$StreamItemPhotos;
-Landroid/provider/ContactsContract$StreamItems$StreamItemPhotos;->CONTENT_DIRECTORY:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItems$StreamItemPhotos;->CONTENT_ITEM_TYPE:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItems$StreamItemPhotos;->CONTENT_TYPE:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItems;
-Landroid/provider/ContactsContract$StreamItems;->CONTENT_ITEM_TYPE:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItems;->CONTENT_LIMIT_URI:Landroid/net/Uri;
-Landroid/provider/ContactsContract$StreamItems;->CONTENT_PHOTO_URI:Landroid/net/Uri;
-Landroid/provider/ContactsContract$StreamItems;->CONTENT_TYPE:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItems;->CONTENT_URI:Landroid/net/Uri;
-Landroid/provider/ContactsContract$StreamItems;->MAX_ITEMS:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;
-Landroid/provider/ContactsContract$StreamItemsColumns;->ACCOUNT_NAME:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->ACCOUNT_TYPE:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->COMMENTS:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->CONTACT_ID:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->CONTACT_LOOKUP_KEY:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->DATA_SET:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->RAW_CONTACT_ID:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->RAW_CONTACT_SOURCE_ID:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->RES_ICON:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->RES_LABEL:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->RES_PACKAGE:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->SYNC1:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->SYNC2:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->SYNC3:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->SYNC4:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->TEXT:Ljava/lang/String;
-Landroid/provider/ContactsContract$StreamItemsColumns;->TIMESTAMP:Ljava/lang/String;
-Landroid/provider/Downloads$Impl$RequestHeaders;->INSERT_KEY_PREFIX:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_ALLOWED_NETWORK_TYPES:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_ALLOW_ROAMING:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_COOKIE_DATA:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_DELETED:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_DESCRIPTION:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_DESTINATION:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_FILE_NAME_HINT:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_IS_PUBLIC_API:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_MEDIA_SCANNED:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_MIME_TYPE:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_NOTIFICATION_CLASS:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_NOTIFICATION_EXTRAS:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_NOTIFICATION_PACKAGE:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_REFERER:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_TITLE:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_URI:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->COLUMN_VISIBILITY:Ljava/lang/String;
-Landroid/provider/Downloads$Impl;->CONTENT_URI:Landroid/net/Uri;
-Landroid/provider/Downloads$Impl;->DESTINATION_CACHE_PARTITION_PURGEABLE:I
-Landroid/provider/Downloads$Impl;->DESTINATION_FILE_URI:I
-Landroid/provider/Settings$ContentProviderHolder;->mContentProvider:Landroid/content/IContentProvider;
-Landroid/provider/Settings$Global;->CONTACT_METADATA_SYNC:Ljava/lang/String;
-Landroid/provider/Settings$Global;->ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED:Ljava/lang/String;
-Landroid/provider/Settings$Global;->PACKAGE_VERIFIER_ENABLE:Ljava/lang/String;
-Landroid/provider/Settings$Global;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String;
-Landroid/provider/Settings$Global;->sNameValueCache:Landroid/provider/Settings$NameValueCache;
-Landroid/provider/Settings$NameValueCache;->mProviderHolder:Landroid/provider/Settings$ContentProviderHolder;
-Landroid/provider/Settings$Secure;->ACCESSIBILITY_AUTOCLICK_ENABLED:Ljava/lang/String;
-Landroid/provider/Settings$Secure;->ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED:Ljava/lang/String;
-Landroid/provider/Settings$Secure;->ACCESSIBILITY_LARGE_POINTER_ICON:Ljava/lang/String;
-Landroid/provider/Settings$Secure;->ENABLED_NOTIFICATION_LISTENERS:Ljava/lang/String;
-Landroid/provider/Settings$Secure;->INCALL_POWER_BUTTON_BEHAVIOR:Ljava/lang/String;
-Landroid/provider/Settings$Secure;->LONG_PRESS_TIMEOUT:Ljava/lang/String;
-Landroid/provider/Settings$Secure;->PACKAGE_VERIFIER_USER_CONSENT:Ljava/lang/String;
-Landroid/provider/Settings$Secure;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String;
-Landroid/provider/Settings$Secure;->putIntForUser(Landroid/content/ContentResolver;Ljava/lang/String;II)Z
-Landroid/provider/Settings$Secure;->sNameValueCache:Landroid/provider/Settings$NameValueCache;
-Landroid/provider/Settings$System;->AIRPLANE_MODE_TOGGLEABLE_RADIOS:Ljava/lang/String;
-Landroid/provider/Settings$System;->APPEND_FOR_LAST_AUDIBLE:Ljava/lang/String;
-Landroid/provider/Settings$System;->HEARING_AID:Ljava/lang/String;
-Landroid/provider/Settings$System;->MASTER_MONO:Ljava/lang/String;
-Landroid/provider/Settings$System;->SCREEN_AUTO_BRIGHTNESS_ADJ:Ljava/lang/String;
-Landroid/provider/Settings$System;->VOLUME_ALARM:Ljava/lang/String;
-Landroid/provider/Settings$System;->VOLUME_BLUETOOTH_SCO:Ljava/lang/String;
-Landroid/provider/Settings$System;->VOLUME_MUSIC:Ljava/lang/String;
-Landroid/provider/Settings$System;->VOLUME_NOTIFICATION:Ljava/lang/String;
-Landroid/provider/Settings$System;->VOLUME_RING:Ljava/lang/String;
-Landroid/provider/Settings$System;->VOLUME_SETTINGS:[Ljava/lang/String;
-Landroid/provider/Settings$System;->VOLUME_SYSTEM:Ljava/lang/String;
-Landroid/provider/Settings$System;->VOLUME_VOICE:Ljava/lang/String;
-Landroid/provider/Settings$System;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String;
-Landroid/provider/Settings$System;->putStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;I)Z
-Landroid/provider/Settings$System;->sNameValueCache:Landroid/provider/Settings$NameValueCache;
-Landroid/provider/Settings;->isCallingPackageAllowedToDrawOverlays(Landroid/content/Context;ILjava/lang/String;Z)Z
-Landroid/provider/Settings;->isCallingPackageAllowedToWriteSettings(Landroid/content/Context;ILjava/lang/String;Z)Z
-Landroid/provider/Telephony$Mms;->isEmailAddress(Ljava/lang/String;)Z
-Landroid/provider/Telephony$Sms$Draft;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Landroid/net/Uri;
-Landroid/provider/Telephony$Sms$Inbox;->addMessage(ILandroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Z)Landroid/net/Uri;
-Landroid/provider/Telephony$Sms$Inbox;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Z)Landroid/net/Uri;
-Landroid/provider/Telephony$Sms$Intents;->SMS_EMERGENCY_CB_RECEIVED_ACTION:Ljava/lang/String;
-Landroid/provider/Telephony$Sms$Outbox;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZJ)Landroid/net/Uri;
-Landroid/provider/Telephony$Sms$Sent;->addMessage(ILandroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Landroid/net/Uri;
-Landroid/provider/Telephony$Sms$Sent;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Landroid/net/Uri;
-Landroid/provider/Telephony$Sms;->addMessageToUri(ILandroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZZ)Landroid/net/Uri;
-Landroid/provider/Telephony$Sms;->addMessageToUri(ILandroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZZJ)Landroid/net/Uri;
-Landroid/provider/Telephony$Sms;->addMessageToUri(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZZ)Landroid/net/Uri;
-Landroid/provider/Telephony$Sms;->addMessageToUri(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZZJ)Landroid/net/Uri;
-Landroid/renderscript/RenderScript;->create(Landroid/content/Context;I)Landroid/renderscript/RenderScript;
-Landroid/renderscript/RenderScript;->create(Landroid/content/Context;ILandroid/renderscript/RenderScript$ContextType;I)Landroid/renderscript/RenderScript;
-Landroid/renderscript/RenderScript;->getMinorID()J
-Landroid/renderscript/RenderScriptCacheDir;->mCacheDir:Ljava/io/File;
-Landroid/renderscript/RenderScriptCacheDir;->setupDiskCache(Ljava/io/File;)V
-Landroid/security/KeyStore;->getInstance()Landroid/security/KeyStore;
-Landroid/security/keystore/AndroidKeyStoreProvider;->getKeyStoreOperationHandle(Ljava/lang/Object;)J
-Landroid/security/keystore/recovery/KeyChainSnapshot;->getTrustedHardwarePublicKey()[B
-Landroid/security/keystore/recovery/RecoveryController;->generateAndStoreKey(Ljava/lang/String;[B)[B
-Landroid/security/keystore/recovery/RecoveryController;->generateKey(Ljava/lang/String;[B)Ljava/security/Key;
-Landroid/security/keystore/recovery/RecoveryController;->getAliases(Ljava/lang/String;)Ljava/util/List;
-Landroid/security/keystore/recovery/RecoveryController;->getRecoveryData()Landroid/security/keystore/recovery/KeyChainSnapshot;
-Landroid/security/keystore/recovery/RecoveryController;->getRecoveryStatus(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/security/keystore/recovery/RecoveryController;->initRecoveryService(Ljava/lang/String;[B)V
-Landroid/security/keystore/recovery/RecoveryController;->setRecoveryStatus(Ljava/lang/String;Ljava/lang/String;I)V
-Landroid/security/keystore/recovery/RecoverySession;->recoverKeys([BLjava/util/List;)Ljava/util/Map;
-Landroid/security/keystore/recovery/RecoverySession;->start(Ljava/security/cert/CertPath;[B[BLjava/util/List;)[B
-Landroid/security/keystore/recovery/RecoverySession;->start([B[B[BLjava/util/List;)[B
-Landroid/security/keystore/recovery/WrappedApplicationKey$Builder;->setAccount([B)Landroid/security/keystore/recovery/WrappedApplicationKey$Builder;
-Landroid/security/keystore/recovery/WrappedApplicationKey;->getAccount()[B
-Landroid/security/net/config/RootTrustManager;->checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
-Landroid/service/dreams/DreamService;->canDoze()Z
-Landroid/service/dreams/DreamService;->isDozing()Z
-Landroid/service/dreams/DreamService;->startDozing()V
-Landroid/service/dreams/DreamService;->stopDozing()V
-Landroid/service/euicc/EuiccProfileInfo;-><init>(Ljava/lang/String;[Landroid/telephony/UiccAccessRule;Ljava/lang/String;)V
-Landroid/service/euicc/GetDefaultDownloadableSubscriptionListResult;->result:I
-Landroid/service/euicc/GetDownloadableSubscriptionMetadataResult;->result:I
-Landroid/service/media/IMediaBrowserServiceCallbacks$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/media/IMediaBrowserServiceCallbacks;
-Landroid/service/media/IMediaBrowserServiceCallbacks;->onConnect(Ljava/lang/String;Landroid/media/session/MediaSession$Token;Landroid/os/Bundle;)V
-Landroid/service/media/IMediaBrowserServiceCallbacks;->onConnectFailed()V
-Landroid/service/media/IMediaBrowserServiceCallbacks;->onLoadChildren(Ljava/lang/String;Landroid/content/pm/ParceledListSlice;)V
-Landroid/service/media/IMediaBrowserServiceCallbacks;->onLoadChildrenWithOptions(Ljava/lang/String;Landroid/content/pm/ParceledListSlice;Landroid/os/Bundle;)V
-Landroid/service/media/MediaBrowserService$Result;->mFlags:I
-Landroid/service/media/MediaBrowserService;->KEY_MEDIA_ITEM:Ljava/lang/String;
-Landroid/service/notification/NotificationListenerService$Ranking;->getAdditionalPeople()Ljava/util/List;
-Landroid/service/notification/NotificationListenerService$Ranking;->getSnoozeCriteria()Ljava/util/List;
-Landroid/service/notification/NotificationListenerService;->TRIM_FULL:I
-Landroid/service/notification/NotificationListenerService;->TRIM_LIGHT:I
-Landroid/service/notification/NotificationListenerService;->getActiveNotifications(I)[Landroid/service/notification/StatusBarNotification;
-Landroid/service/notification/NotificationListenerService;->getActiveNotifications([Ljava/lang/String;I)[Landroid/service/notification/StatusBarNotification;
-Landroid/service/notification/NotificationListenerService;->isBound()Z
-Landroid/service/notification/NotificationListenerService;->mHandler:Landroid/os/Handler;
-Landroid/service/notification/NotificationListenerService;->registerAsSystemService(Landroid/content/Context;Landroid/content/ComponentName;I)V
-Landroid/service/notification/NotificationListenerService;->setOnNotificationPostedTrim(I)V
-Landroid/service/notification/NotificationListenerService;->snoozeNotification(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/service/notification/NotificationListenerService;->unregisterAsSystemService()V
-Landroid/service/notification/StatusBarNotification;->getInitialPid()I
-Landroid/service/notification/StatusBarNotification;->getUid()I
-Landroid/service/persistentdata/IPersistentDataBlockService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/persistentdata/IPersistentDataBlockService;
-Landroid/service/voice/AlwaysOnHotwordDetector$EventPayload;->getCaptureSession()Ljava/lang/Integer;
-Landroid/service/voice/VoiceInteractionService;->isKeyphraseAndLocaleSupportedForHotword(Ljava/lang/String;Ljava/util/Locale;)Z
-Landroid/service/vr/IVrManager;->getVr2dDisplayId()I
-Landroid/service/vr/VrListenerService;->onCurrentVrActivityChanged(Landroid/content/ComponentName;ZI)V
-Landroid/service/wallpaper/WallpaperService$Engine;->setFixedSizeAllowed(Z)V
-Landroid/speech/tts/TextToSpeech;->getCurrentEngine()Ljava/lang/String;
-Landroid/speech/tts/UtteranceProgressListener;->onUtteranceRangeStart(Ljava/lang/String;II)V
-Landroid/system/Int32Ref;->value:I
-Landroid/system/NetlinkSocketAddress;-><init>(II)V
-Landroid/system/Os;->bind(Ljava/io/FileDescriptor;Ljava/net/SocketAddress;)V
-Landroid/system/Os;->connect(Ljava/io/FileDescriptor;Ljava/net/SocketAddress;)V
-Landroid/system/Os;->sendto(Ljava/io/FileDescriptor;[BIIILjava/net/SocketAddress;)I
-Landroid/system/Os;->setsockoptIfreq(Ljava/io/FileDescriptor;IILjava/lang/String;)V
-Landroid/system/Os;->setsockoptTimeval(Ljava/io/FileDescriptor;IILandroid/system/StructTimeval;)V
-Landroid/system/OsConstants;-><init>()V
-Landroid/system/OsConstants;->AF_NETLINK:I
-Landroid/system/OsConstants;->AF_PACKET:I
-Landroid/system/OsConstants;->ARPHRD_ETHER:I
-Landroid/system/OsConstants;->ARPHRD_LOOPBACK:I
-Landroid/system/OsConstants;->CAP_TO_INDEX(I)I
-Landroid/system/OsConstants;->CAP_TO_MASK(I)I
-Landroid/system/OsConstants;->ENONET:I
-Landroid/system/OsConstants;->ETH_P_ALL:I
-Landroid/system/OsConstants;->ETH_P_ARP:I
-Landroid/system/OsConstants;->ETH_P_IP:I
-Landroid/system/OsConstants;->ETH_P_IPV6:I
-Landroid/system/OsConstants;->EUSERS:I
-Landroid/system/OsConstants;->ICMP6_ECHO_REPLY:I
-Landroid/system/OsConstants;->ICMP6_ECHO_REQUEST:I
-Landroid/system/OsConstants;->ICMP_ECHO:I
-Landroid/system/OsConstants;->ICMP_ECHOREPLY:I
-Landroid/system/OsConstants;->IP_MULTICAST_ALL:I
-Landroid/system/OsConstants;->IP_RECVTOS:I
-Landroid/system/OsConstants;->MAP_POPULATE:I
-Landroid/system/OsConstants;->NETLINK_NETFILTER:I
-Landroid/system/OsConstants;->NETLINK_ROUTE:I
-Landroid/system/OsConstants;->O_DIRECT:I
-Landroid/system/OsConstants;->PR_CAP_AMBIENT:I
-Landroid/system/OsConstants;->PR_CAP_AMBIENT_RAISE:I
-Landroid/system/OsConstants;->RLIMIT_NOFILE:I
-Landroid/system/OsConstants;->RTMGRP_IPV4_IFADDR:I
-Landroid/system/OsConstants;->RTMGRP_IPV4_MROUTE:I
-Landroid/system/OsConstants;->RTMGRP_IPV4_ROUTE:I
-Landroid/system/OsConstants;->RTMGRP_IPV4_RULE:I
-Landroid/system/OsConstants;->RTMGRP_IPV6_IFADDR:I
-Landroid/system/OsConstants;->RTMGRP_IPV6_IFINFO:I
-Landroid/system/OsConstants;->RTMGRP_IPV6_MROUTE:I
-Landroid/system/OsConstants;->RTMGRP_IPV6_PREFIX:I
-Landroid/system/OsConstants;->RTMGRP_IPV6_ROUTE:I
-Landroid/system/OsConstants;->RTMGRP_LINK:I
-Landroid/system/OsConstants;->RTMGRP_NEIGH:I
-Landroid/system/OsConstants;->RTMGRP_NOTIFY:I
-Landroid/system/OsConstants;->RTMGRP_TC:I
-Landroid/system/OsConstants;->SO_DOMAIN:I
-Landroid/system/OsConstants;->SO_PROTOCOL:I
-Landroid/system/OsConstants;->SPLICE_F_MORE:I
-Landroid/system/OsConstants;->SPLICE_F_MOVE:I
-Landroid/system/OsConstants;->SPLICE_F_NONBLOCK:I
-Landroid/system/OsConstants;->TIOCOUTQ:I
-Landroid/system/OsConstants;->UDP_ENCAP:I
-Landroid/system/OsConstants;->UDP_ENCAP_ESPINUDP:I
-Landroid/system/OsConstants;->UDP_ENCAP_ESPINUDP_NON_IKE:I
-Landroid/system/OsConstants;->UNIX_PATH_MAX:I
-Landroid/system/OsConstants;->XATTR_CREATE:I
-Landroid/system/OsConstants;->XATTR_REPLACE:I
-Landroid/system/OsConstants;->_LINUX_CAPABILITY_VERSION_3:I
-Landroid/system/OsConstants;->initConstants()V
-Landroid/system/OsConstants;->placeholder()I
-Landroid/system/PacketSocketAddress;-><init>(I[B)V
-Landroid/system/PacketSocketAddress;-><init>(SI)V
-Landroid/system/StructTimeval;->fromMillis(J)Landroid/system/StructTimeval;
-Landroid/telecom/AudioState;->isMuted:Z
-Landroid/telecom/ParcelableCall;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/telecom/ParcelableCall;->getConnectTimeMillis()J
-Landroid/telecom/ParcelableCall;->getDisconnectCause()Landroid/telecom/DisconnectCause;
-Landroid/telecom/ParcelableCall;->getHandle()Landroid/net/Uri;
-Landroid/telecom/ParcelableCall;->getId()Ljava/lang/String;
-Landroid/telecom/TelecomManager;->EXTRA_IS_HANDOVER:Ljava/lang/String;
-Landroid/telecom/TelecomManager;->from(Landroid/content/Context;)Landroid/telecom/TelecomManager;
-Landroid/telecom/TelecomManager;->getUserSelectedOutgoingPhoneAccount()Landroid/telecom/PhoneAccountHandle;
-Landroid/telecom/TelecomManager;->setUserSelectedOutgoingPhoneAccount(Landroid/telecom/PhoneAccountHandle;)V
-Landroid/telecom/VideoProfile$CameraCapabilities;-><init>(IIZF)V
-Landroid/telephony/CellSignalStrengthLte;->mCqi:I
-Landroid/telephony/CellSignalStrengthLte;->mRsrp:I
-Landroid/telephony/CellSignalStrengthLte;->mRsrq:I
-Landroid/telephony/CellSignalStrengthLte;->mRssnr:I
-Landroid/telephony/CellSignalStrengthLte;->mSignalStrength:I
-Landroid/telephony/CellSignalStrengthLte;->mTimingAdvance:I
-Landroid/telephony/CellSignalStrengthWcdma;->mBitErrorRate:I
-Landroid/telephony/CellSignalStrengthWcdma;->mSignalStrength:I
-Landroid/telephony/NetworkScan;->stop()V
-Landroid/telephony/PhoneNumberUtils;->formatNumber(Ljava/lang/String;I)Ljava/lang/String;
-Landroid/telephony/PhoneNumberUtils;->isEmergencyNumber(ILjava/lang/String;)Z
-Landroid/telephony/PhoneNumberUtils;->isLocalEmergencyNumber(Landroid/content/Context;ILjava/lang/String;)Z
-Landroid/telephony/PhoneNumberUtils;->isPotentialEmergencyNumber(ILjava/lang/String;)Z
-Landroid/telephony/PhoneNumberUtils;->isPotentialLocalEmergencyNumber(Landroid/content/Context;ILjava/lang/String;)Z
-Landroid/telephony/PhoneStateListener;-><init>(Ljava/lang/Integer;)V
-Landroid/telephony/PhoneStateListener;-><init>(Ljava/lang/Integer;Landroid/os/Looper;)V
-Landroid/telephony/PhoneStateListener;->mSubId:Ljava/lang/Integer;
-Landroid/telephony/PreciseCallState;->getBackgroundCallState()I
-Landroid/telephony/PreciseCallState;->getForegroundCallState()I
-Landroid/telephony/RadioAccessFamily;-><init>(II)V
-Landroid/telephony/RadioAccessFamily;->getRafFromNetworkType(I)I
-Landroid/telephony/Rlog;->d(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/telephony/Rlog;->e(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/telephony/Rlog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-Landroid/telephony/Rlog;->i(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/telephony/ServiceState;->bitmaskHasTech(II)Z
-Landroid/telephony/ServiceState;->getDataRegState()I
-Landroid/telephony/ServiceState;->getDataRoaming()Z
-Landroid/telephony/ServiceState;->getRilDataRadioTechnology()I
-Landroid/telephony/ServiceState;->getVoiceNetworkType()I
-Landroid/telephony/ServiceState;->getVoiceRegState()I
-Landroid/telephony/ServiceState;->isCdma(I)Z
-Landroid/telephony/ServiceState;->isEmergencyOnly()Z
-Landroid/telephony/ServiceState;->isGsm(I)Z
-Landroid/telephony/ServiceState;->mergeServiceStates(Landroid/telephony/ServiceState;Landroid/telephony/ServiceState;)Landroid/telephony/ServiceState;
-Landroid/telephony/ServiceState;->newFromBundle(Landroid/os/Bundle;)Landroid/telephony/ServiceState;
-Landroid/telephony/ServiceState;->rilRadioTechnologyToString(I)Ljava/lang/String;
-Landroid/telephony/SignalStrength;-><init>()V
-Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_GOOD:I
-Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_GREAT:I
-Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_MODERATE:I
-Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_NONE_OR_UNKNOWN:I
-Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_POOR:I
-Landroid/telephony/SignalStrength;->getAsuLevel()I
-Landroid/telephony/SignalStrength;->getCdmaLevel()I
-Landroid/telephony/SignalStrength;->getDbm()I
-Landroid/telephony/SignalStrength;->getGsmDbm()I
-Landroid/telephony/SignalStrength;->getLteDbm()I
-Landroid/telephony/SignalStrength;->getLteRsrp()I
-Landroid/telephony/SignalStrength;->getLteRsrq()I
-Landroid/telephony/SignalStrength;->getLteRssnr()I
-Landroid/telephony/SignalStrength;->getLteSignalStrength()I
-Landroid/telephony/SignalStrength;->mGsmBitErrorRate:I
-Landroid/telephony/SignalStrength;->mGsmSignalStrength:I
-Landroid/telephony/SignalStrength;->mLteCqi:I
-Landroid/telephony/SignalStrength;->mLteRsrp:I
-Landroid/telephony/SignalStrength;->mLteRsrq:I
-Landroid/telephony/SignalStrength;->mLteRssnr:I
-Landroid/telephony/SignalStrength;->mLteSignalStrength:I
-Landroid/telephony/SmsManager;->sendMultipartTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/ArrayList;IZI)V
-Landroid/telephony/SmsManager;->sendTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/app/PendingIntent;Landroid/app/PendingIntent;IZI)V
-Landroid/telephony/SmsMessage;->getSubId()I
-Landroid/telephony/SmsMessage;->mWrappedSmsMessage:Lcom/android/internal/telephony/SmsMessageBase;
-Landroid/telephony/SubscriptionInfo;->setDisplayName(Ljava/lang/CharSequence;)V
-Landroid/telephony/SubscriptionInfo;->setIconTint(I)V
-Landroid/telephony/SubscriptionManager;->clearDefaultsForInactiveSubIds()V
-Landroid/telephony/SubscriptionManager;->getActiveSubscriptionIdList()[I
-Landroid/telephony/SubscriptionManager;->getAllSubscriptionInfoCount()I
-Landroid/telephony/SubscriptionManager;->getAllSubscriptionInfoList()Ljava/util/List;
-Landroid/telephony/SubscriptionManager;->getDefaultDataPhoneId()I
-Landroid/telephony/SubscriptionManager;->getDefaultDataSubscriptionInfo()Landroid/telephony/SubscriptionInfo;
-Landroid/telephony/SubscriptionManager;->getDefaultSmsPhoneId()I
-Landroid/telephony/SubscriptionManager;->getDefaultVoicePhoneId()I
-Landroid/telephony/SubscriptionManager;->getDefaultVoiceSubscriptionInfo()Landroid/telephony/SubscriptionInfo;
-Landroid/telephony/SubscriptionManager;->getPhoneId(I)I
-Landroid/telephony/SubscriptionManager;->getResourcesForSubId(Landroid/content/Context;I)Landroid/content/res/Resources;
-Landroid/telephony/SubscriptionManager;->getSlotIndex(I)I
-Landroid/telephony/SubscriptionManager;->getSubId(I)[I
-Landroid/telephony/SubscriptionManager;->isActiveSubId(I)Z
-Landroid/telephony/SubscriptionManager;->isUsableSubIdValue(I)Z
-Landroid/telephony/SubscriptionManager;->isValidPhoneId(I)Z
-Landroid/telephony/SubscriptionManager;->isValidSlotIndex(I)Z
-Landroid/telephony/SubscriptionManager;->isValidSubscriptionId(I)Z
-Landroid/telephony/SubscriptionManager;->putPhoneIdAndSubIdExtra(Landroid/content/Intent;I)V
-Landroid/telephony/SubscriptionManager;->putPhoneIdAndSubIdExtra(Landroid/content/Intent;II)V
-Landroid/telephony/SubscriptionManager;->setDefaultDataSubId(I)V
-Landroid/telephony/SubscriptionManager;->setDefaultSmsSubId(I)V
-Landroid/telephony/SubscriptionManager;->setDisplayName(Ljava/lang/String;IJ)I
-Landroid/telephony/SubscriptionManager;->setIconTint(II)I
-Landroid/telephony/TelephonyManager$MultiSimVariants;->DSDA:Landroid/telephony/TelephonyManager$MultiSimVariants;
-Landroid/telephony/TelephonyManager$MultiSimVariants;->DSDS:Landroid/telephony/TelephonyManager$MultiSimVariants;
-Landroid/telephony/TelephonyManager;-><init>()V
-Landroid/telephony/TelephonyManager;-><init>(Landroid/content/Context;)V
-Landroid/telephony/TelephonyManager;->from(Landroid/content/Context;)Landroid/telephony/TelephonyManager;
-Landroid/telephony/TelephonyManager;->getCallState(I)I
-Landroid/telephony/TelephonyManager;->getDataNetworkType(I)I
-Landroid/telephony/TelephonyManager;->getDefault()Landroid/telephony/TelephonyManager;
-Landroid/telephony/TelephonyManager;->getGroupIdLevel1(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getITelephony()Lcom/android/internal/telephony/ITelephony;
-Landroid/telephony/TelephonyManager;->getIntAtIndex(Landroid/content/ContentResolver;Ljava/lang/String;I)I
-Landroid/telephony/TelephonyManager;->getIsimDomain()Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getLine1Number(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getMultiSimConfiguration()Landroid/telephony/TelephonyManager$MultiSimVariants;
-Landroid/telephony/TelephonyManager;->getNetworkClass(I)I
-Landroid/telephony/TelephonyManager;->getNetworkCountryIso(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getNetworkOperator(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getNetworkOperatorForPhone(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getNetworkOperatorName(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getNetworkType(I)I
-Landroid/telephony/TelephonyManager;->getNetworkTypeName()Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getNetworkTypeName(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getPhoneType(I)I
-Landroid/telephony/TelephonyManager;->getPreferredNetworkType(I)I
-Landroid/telephony/TelephonyManager;->getServiceStateForSubscriber(I)Landroid/telephony/ServiceState;
-Landroid/telephony/TelephonyManager;->getSimCount()I
-Landroid/telephony/TelephonyManager;->getSimOperator(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getSimOperatorName(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getSimOperatorNameForPhone(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getSimOperatorNumeric(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getSimOperatorNumericForPhone(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getSimSerialNumber(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getSubIdForPhoneAccount(Landroid/telecom/PhoneAccount;)I
-Landroid/telephony/TelephonyManager;->getSubscriberId(I)Ljava/lang/String;
-Landroid/telephony/TelephonyManager;->getSubscriberInfo()Lcom/android/internal/telephony/IPhoneSubInfo;
-Landroid/telephony/TelephonyManager;->getVoiceMessageCount()I
-Landroid/telephony/TelephonyManager;->getVoiceNetworkType(I)I
-Landroid/telephony/TelephonyManager;->hasIccCard(I)Z
-Landroid/telephony/TelephonyManager;->isImsRegistered()Z
-Landroid/telephony/TelephonyManager;->isMultiSimEnabled()Z
-Landroid/telephony/TelephonyManager;->isNetworkRoaming(I)Z
-Landroid/telephony/TelephonyManager;->isVideoTelephonyAvailable()Z
-Landroid/telephony/TelephonyManager;->isVolteAvailable()Z
-Landroid/telephony/TelephonyManager;->isWifiCallingAvailable()Z
-Landroid/telephony/TelephonyManager;->mSubscriptionManager:Landroid/telephony/SubscriptionManager;
-Landroid/telephony/TelephonyManager;->nvResetConfig(I)Z
-Landroid/telephony/TelephonyManager;->putIntAtIndex(Landroid/content/ContentResolver;Ljava/lang/String;II)Z
-Landroid/telephony/TelephonyManager;->requestNetworkScan(Landroid/telephony/NetworkScanRequest;Landroid/telephony/TelephonyScanManager$NetworkScanCallback;)Landroid/telephony/NetworkScan;
-Landroid/telephony/TelephonyManager;->setPreferredNetworkType(II)Z
-Landroid/telephony/euicc/DownloadableSubscription;->encodedActivationCode:Ljava/lang/String;
-Landroid/telephony/euicc/DownloadableSubscription;->setAccessRules([Landroid/telephony/UiccAccessRule;)V
-Landroid/telephony/euicc/DownloadableSubscription;->setCarrierName(Ljava/lang/String;)V
-Landroid/telephony/ims/ImsCallForwardInfo;-><init>()V
-Landroid/telephony/ims/ImsCallForwardInfo;->mCondition:I
-Landroid/telephony/ims/ImsCallForwardInfo;->mNumber:Ljava/lang/String;
-Landroid/telephony/ims/ImsCallForwardInfo;->mServiceClass:I
-Landroid/telephony/ims/ImsCallForwardInfo;->mStatus:I
-Landroid/telephony/ims/ImsCallForwardInfo;->mTimeSeconds:I
-Landroid/telephony/ims/ImsCallForwardInfo;->mToA:I
-Landroid/telephony/ims/ImsCallProfile;->mCallExtras:Landroid/os/Bundle;
-Landroid/telephony/ims/ImsCallProfile;->mCallType:I
-Landroid/telephony/ims/ImsCallProfile;->mMediaProfile:Landroid/telephony/ims/ImsStreamMediaProfile;
-Landroid/telephony/ims/ImsCallProfile;->mRestrictCause:I
-Landroid/telephony/ims/ImsCallProfile;->presentationToOIR(I)I
-Landroid/telephony/ims/ImsExternalCallState;-><init>(ILandroid/net/Uri;ZIIZ)V
-Landroid/telephony/ims/ImsReasonInfo;-><init>(II)V
-Landroid/telephony/ims/ImsReasonInfo;->mCode:I
-Landroid/telephony/ims/ImsReasonInfo;->mExtraCode:I
-Landroid/telephony/ims/ImsReasonInfo;->mExtraMessage:Ljava/lang/String;
-Landroid/telephony/ims/ImsSsInfo;->mIcbNum:Ljava/lang/String;
-Landroid/telephony/ims/ImsSsInfo;->mStatus:I
-Landroid/telephony/ims/ImsStreamMediaProfile;-><init>()V
-Landroid/telephony/ims/ImsStreamMediaProfile;->mAudioDirection:I
-Landroid/telephony/ims/ImsStreamMediaProfile;->mAudioQuality:I
-Landroid/telephony/ims/ImsStreamMediaProfile;->mVideoDirection:I
-Landroid/telephony/ims/ImsVideoCallProvider;->getInterface()Lcom/android/ims/internal/IImsVideoCallProvider;
-Landroid/telephony/ims/compat/ImsService;-><init>()V
-Landroid/telephony/ims/compat/ImsService;->mImsServiceController:Landroid/os/IBinder;
-Landroid/telephony/ims/compat/feature/ImsFeature;->getFeatureState()I
-Landroid/telephony/ims/compat/feature/ImsFeature;->setFeatureState(I)V
-Landroid/telephony/ims/compat/feature/MMTelFeature;-><init>()V
-Landroid/telephony/ims/compat/stub/ImsCallSessionImplBase;-><init>()V
-Landroid/telephony/ims/compat/stub/ImsConfigImplBase;-><init>(Landroid/content/Context;)V
-Landroid/telephony/ims/compat/stub/ImsConfigImplBase;->getIImsConfig()Lcom/android/ims/internal/IImsConfig;
-Landroid/telephony/ims/compat/stub/ImsUtListenerImplBase;-><init>()V
-Landroid/telephony/mbms/IMbmsStreamingSessionCallback$Stub;-><init>()V
-Landroid/telephony/mbms/IStreamingServiceCallback$Stub;-><init>()V
-Landroid/telephony/mbms/vendor/IMbmsStreamingService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/telephony/mbms/vendor/IMbmsStreamingService;
-Landroid/telephony/mbms/vendor/IMbmsStreamingService;->getPlaybackUri(ILjava/lang/String;)Landroid/net/Uri;
-Landroid/telephony/mbms/vendor/IMbmsStreamingService;->initialize(Landroid/telephony/mbms/IMbmsStreamingSessionCallback;I)I
-Landroid/telephony/mbms/vendor/IMbmsStreamingService;->requestUpdateStreamingServices(ILjava/util/List;)I
-Landroid/telephony/mbms/vendor/IMbmsStreamingService;->startStreaming(ILjava/lang/String;Landroid/telephony/mbms/IStreamingServiceCallback;)I
-Landroid/text/AndroidBidi;->bidi(I[C[B)I
-Landroid/text/BoringLayout;->isBoring(Ljava/lang/CharSequence;Landroid/text/TextPaint;Landroid/text/TextDirectionHeuristic;Landroid/text/BoringLayout$Metrics;)Landroid/text/BoringLayout$Metrics;
-Landroid/text/DynamicLayout;-><init>(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;Landroid/text/TextDirectionHeuristic;FFZIIILandroid/text/TextUtils$TruncateAt;I)V
-Landroid/text/DynamicLayout;->sStaticLayout:Landroid/text/StaticLayout;
-Landroid/text/Html;->withinStyle(Ljava/lang/StringBuilder;Ljava/lang/CharSequence;II)V
-Landroid/text/Layout$Alignment;->ALIGN_LEFT:Landroid/text/Layout$Alignment;
-Landroid/text/Layout$Alignment;->ALIGN_RIGHT:Landroid/text/Layout$Alignment;
-Landroid/text/Layout;->DIRS_ALL_LEFT_TO_RIGHT:Landroid/text/Layout$Directions;
-Landroid/text/Layout;->getPrimaryHorizontal(IZ)F
-Landroid/text/SpanSet;->spans:[Ljava/lang/Object;
-Landroid/text/SpannableStringBuilder;->mGapLength:I
-Landroid/text/SpannableStringBuilder;->mGapStart:I
-Landroid/text/SpannableStringBuilder;->mSpanCount:I
-Landroid/text/SpannableStringBuilder;->mSpanEnds:[I
-Landroid/text/SpannableStringBuilder;->mSpanFlags:[I
-Landroid/text/SpannableStringBuilder;->mSpanStarts:[I
-Landroid/text/SpannableStringBuilder;->mSpans:[Ljava/lang/Object;
-Landroid/text/SpannableStringInternal;-><init>(Ljava/lang/CharSequence;II)V
-Landroid/text/SpannableStringInternal;->COLUMNS:I
-Landroid/text/SpannableStringInternal;->EMPTY:[Ljava/lang/Object;
-Landroid/text/SpannableStringInternal;->END:I
-Landroid/text/SpannableStringInternal;->FLAGS:I
-Landroid/text/SpannableStringInternal;->START:I
-Landroid/text/SpannableStringInternal;->charAt(I)C
-Landroid/text/SpannableStringInternal;->checkRange(Ljava/lang/String;II)V
-Landroid/text/SpannableStringInternal;->copySpans(Landroid/text/SpannableStringInternal;II)V
-Landroid/text/SpannableStringInternal;->copySpans(Landroid/text/Spanned;II)V
-Landroid/text/SpannableStringInternal;->getChars(II[CI)V
-Landroid/text/SpannableStringInternal;->getSpanEnd(Ljava/lang/Object;)I
-Landroid/text/SpannableStringInternal;->getSpanFlags(Ljava/lang/Object;)I
-Landroid/text/SpannableStringInternal;->getSpanStart(Ljava/lang/Object;)I
-Landroid/text/SpannableStringInternal;->getSpans(IILjava/lang/Class;)[Ljava/lang/Object;
-Landroid/text/SpannableStringInternal;->isIndexFollowsNextLine(I)Z
-Landroid/text/SpannableStringInternal;->isOutOfCopyRange(IIII)Z
-Landroid/text/SpannableStringInternal;->length()I
-Landroid/text/SpannableStringInternal;->mSpanCount:I
-Landroid/text/SpannableStringInternal;->mSpanData:[I
-Landroid/text/SpannableStringInternal;->mSpans:[Ljava/lang/Object;
-Landroid/text/SpannableStringInternal;->mText:Ljava/lang/String;
-Landroid/text/SpannableStringInternal;->nextSpanTransition(IILjava/lang/Class;)I
-Landroid/text/SpannableStringInternal;->region(II)Ljava/lang/String;
-Landroid/text/SpannableStringInternal;->removeSpan(Ljava/lang/Object;)V
-Landroid/text/SpannableStringInternal;->sendSpanAdded(Ljava/lang/Object;II)V
-Landroid/text/SpannableStringInternal;->sendSpanChanged(Ljava/lang/Object;IIII)V
-Landroid/text/SpannableStringInternal;->sendSpanRemoved(Ljava/lang/Object;II)V
-Landroid/text/SpannableStringInternal;->setSpan(Ljava/lang/Object;III)V
-Landroid/text/SpannableStringInternal;->setSpan(Ljava/lang/Object;IIIZ)V
-Landroid/text/StaticLayout$LineBreaks;->ascents:[F
-Landroid/text/StaticLayout$LineBreaks;->breaks:[I
-Landroid/text/StaticLayout$LineBreaks;->descents:[F
-Landroid/text/StaticLayout$LineBreaks;->flags:[I
-Landroid/text/StaticLayout$LineBreaks;->widths:[F
-Landroid/text/StaticLayout;-><init>(Ljava/lang/CharSequence;IILandroid/text/TextPaint;ILandroid/text/Layout$Alignment;Landroid/text/TextDirectionHeuristic;FFZLandroid/text/TextUtils$TruncateAt;II)V
-Landroid/text/StaticLayout;->getHeight(Z)I
-Landroid/text/StaticLayout;->mColumns:I
-Landroid/text/StaticLayout;->mLineCount:I
-Landroid/text/StaticLayout;->mLines:[I
-Landroid/text/StaticLayout;->mMaximumVisibleLineCount:I
-Landroid/text/TextLine;->mCharacterStyleSpanSet:Landroid/text/SpanSet;
-Landroid/text/TextLine;->mMetricAffectingSpanSpanSet:Landroid/text/SpanSet;
-Landroid/text/TextLine;->mReplacementSpanSpanSet:Landroid/text/SpanSet;
-Landroid/text/TextLine;->mSpanned:Landroid/text/Spanned;
-Landroid/text/TextLine;->mText:Ljava/lang/CharSequence;
-Landroid/text/TextLine;->obtain()Landroid/text/TextLine;
-Landroid/text/TextLine;->sCached:[Landroid/text/TextLine;
-Landroid/text/TextPaint;->setUnderlineText(IF)V
-Landroid/text/TextUtils$TruncateAt;->END_SMALL:Landroid/text/TextUtils$TruncateAt;
-Landroid/text/TextUtils;->isPrintableAsciiOnly(Ljava/lang/CharSequence;)Z
-Landroid/text/format/DateFormat;->AM_PM:C
-Landroid/text/format/DateFormat;->CAPITAL_AM_PM:C
-Landroid/text/format/DateFormat;->DATE:C
-Landroid/text/format/DateFormat;->DAY:C
-Landroid/text/format/DateFormat;->HOUR:C
-Landroid/text/format/DateFormat;->HOUR_OF_DAY:C
-Landroid/text/format/DateFormat;->MINUTE:C
-Landroid/text/format/DateFormat;->MONTH:C
-Landroid/text/format/DateFormat;->QUOTE:C
-Landroid/text/format/DateFormat;->SECONDS:C
-Landroid/text/format/DateFormat;->STANDALONE_MONTH:C
-Landroid/text/format/DateFormat;->TIME_ZONE:C
-Landroid/text/format/DateFormat;->YEAR:C
-Landroid/text/method/LinkMovementMethod;->sInstance:Landroid/text/method/LinkMovementMethod;
-Landroid/text/style/RasterizerSpan;
-Landroid/text/style/RasterizerSpan;-><init>(Landroid/graphics/Rasterizer;)V
-Landroid/text/style/RasterizerSpan;->getRasterizer()Landroid/graphics/Rasterizer;
-Landroid/transition/ChangeBounds;->BOTTOM_RIGHT_ONLY_PROPERTY:Landroid/util/Property;
-Landroid/transition/ChangeBounds;->POSITION_PROPERTY:Landroid/util/Property;
-Landroid/transition/Scene;->mEnterAction:Ljava/lang/Runnable;
-Landroid/transition/Scene;->mExitAction:Ljava/lang/Runnable;
-Landroid/transition/Scene;->setCurrentScene(Landroid/view/View;Landroid/transition/Scene;)V
-Landroid/transition/TransitionManager;->sRunningTransitions:Ljava/lang/ThreadLocal;
-Landroid/util/ArrayMap;->append(Ljava/lang/Object;Ljava/lang/Object;)V
-Landroid/util/ArrayMap;->mBaseCacheSize:I
-Landroid/util/ArrayMap;->mTwiceBaseCacheSize:I
-Landroid/util/ArraySet;-><init>(Ljava/util/Collection;)V
-Landroid/util/DisplayMetrics;->DENSITY_DEVICE:I
-Landroid/util/DisplayMetrics;->noncompatHeightPixels:I
-Landroid/util/DisplayMetrics;->noncompatWidthPixels:I
-Landroid/util/EventLog$Event;-><init>([B)V
-Landroid/util/FloatMath;->ceil(F)F
-Landroid/util/FloatMath;->cos(F)F
-Landroid/util/FloatMath;->exp(F)F
-Landroid/util/FloatMath;->floor(F)F
-Landroid/util/FloatMath;->hypot(FF)F
-Landroid/util/FloatMath;->pow(FF)F
-Landroid/util/FloatMath;->sin(F)F
-Landroid/util/FloatMath;->sqrt(F)F
-Landroid/util/IconDrawableFactory;->getBadgedIcon(Landroid/content/pm/PackageItemInfo;Landroid/content/pm/ApplicationInfo;I)Landroid/graphics/drawable/Drawable;
-Landroid/util/IconDrawableFactory;->newInstance(Landroid/content/Context;)Landroid/util/IconDrawableFactory;
-Landroid/util/LocalLog$ReadOnlyLocalLog;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
-Landroid/util/LocalLog;-><init>(I)V
-Landroid/util/LocalLog;->log(Ljava/lang/String;)V
-Landroid/util/LocalLog;->readOnlyLocalLog()Landroid/util/LocalLog$ReadOnlyLocalLog;
-Landroid/util/Log;->wtf(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ZZ)I
-Landroid/util/LongArray;-><init>()V
-Landroid/util/LongArray;->add(IJ)V
-Landroid/util/LongArray;->get(I)J
-Landroid/util/LongArray;->size()I
-Landroid/util/LongSparseLongArray;->mKeys:[J
-Landroid/util/LongSparseLongArray;->mSize:I
-Landroid/util/LongSparseLongArray;->mValues:[J
-Landroid/util/MalformedJsonException;->serialVersionUID:J
-Landroid/util/MathUtils;->constrain(III)I
-Landroid/util/NtpTrustedTime;->forceRefresh()Z
-Landroid/util/NtpTrustedTime;->getCachedNtpTime()J
-Landroid/util/NtpTrustedTime;->getCachedNtpTimeReference()J
-Landroid/util/NtpTrustedTime;->getInstance(Landroid/content/Context;)Landroid/util/NtpTrustedTime;
-Landroid/util/NtpTrustedTime;->hasCache()Z
-Landroid/util/PathParser;->createPathFromPathData(Ljava/lang/String;)Landroid/graphics/Path;
-Landroid/util/Pools$SimplePool;->mPool:[Ljava/lang/Object;
-Landroid/util/Pools$SynchronizedPool;-><init>(I)V
-Landroid/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object;
-Landroid/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
-Landroid/util/Rational;->mDenominator:I
-Landroid/util/Rational;->mNumerator:I
-Landroid/util/Rational;->readObject(Ljava/io/ObjectInputStream;)V
-Landroid/util/Rational;->serialVersionUID:J
-Landroid/util/RecurrenceRule;->buildRecurringMonthly(ILjava/time/ZoneId;)Landroid/util/RecurrenceRule;
-Landroid/util/RecurrenceRule;->start:Ljava/time/ZonedDateTime;
-Landroid/util/Singleton;-><init>()V
-Landroid/util/Singleton;->get()Ljava/lang/Object;
-Landroid/util/Singleton;->mInstance:Ljava/lang/Object;
-Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-Landroid/util/Slog;->println(ILjava/lang/String;Ljava/lang/String;)I
-Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/util/Slog;->wtf(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/util/SparseIntArray;->mKeys:[I
-Landroid/util/SparseIntArray;->mSize:I
-Landroid/util/SparseIntArray;->mValues:[I
-Landroid/util/apk/SignatureNotFoundException;->serialVersionUID:J
-Landroid/view/AppTransitionAnimationSpec;-><init>(ILandroid/graphics/GraphicBuffer;Landroid/graphics/Rect;)V
-Landroid/view/BatchedInputEventReceiver;-><init>(Landroid/view/InputChannel;Landroid/os/Looper;Landroid/view/Choreographer;)V
-Landroid/view/Choreographer$CallbackQueue;->addCallbackLocked(JLjava/lang/Object;Ljava/lang/Object;)V
-Landroid/view/Choreographer;->USE_VSYNC:Z
-Landroid/view/Choreographer;->doFrame(JI)V
-Landroid/view/Choreographer;->getFrameTime()J
-Landroid/view/Choreographer;->getSfInstance()Landroid/view/Choreographer;
-Landroid/view/Choreographer;->mCallbackQueues:[Landroid/view/Choreographer$CallbackQueue;
-Landroid/view/Choreographer;->mFrameIntervalNanos:J
-Landroid/view/Choreographer;->mLastFrameTimeNanos:J
-Landroid/view/Choreographer;->mLock:Ljava/lang/Object;
-Landroid/view/Choreographer;->scheduleVsyncLocked()V
-Landroid/view/ContextThemeWrapper;->getThemeResId()I
-Landroid/view/ContextThemeWrapper;->initializeTheme()V
-Landroid/view/ContextThemeWrapper;->mInflater:Landroid/view/LayoutInflater;
-Landroid/view/ContextThemeWrapper;->mResources:Landroid/content/res/Resources;
-Landroid/view/ContextThemeWrapper;->mTheme:Landroid/content/res/Resources$Theme;
-Landroid/view/ContextThemeWrapper;->mThemeResource:I
-Landroid/view/Display$HdrCapabilities;-><init>([IFFF)V
-Landroid/view/Display;->getDisplayAdjustments()Landroid/view/DisplayAdjustments;
-Landroid/view/DisplayAdjustments;->getConfiguration()Landroid/content/res/Configuration;
-Landroid/view/DisplayAdjustments;->setCompatibilityInfo(Landroid/content/res/CompatibilityInfo;)V
-Landroid/view/DisplayEventReceiver;->dispatchHotplug(JIZ)V
-Landroid/view/DisplayEventReceiver;->dispatchVsync(JII)V
-Landroid/view/DisplayListCanvas;->callDrawGLFunction2(J)V
-Landroid/view/DisplayListCanvas;->drawGLFunctor2(JLjava/lang/Runnable;)V
-Landroid/view/DisplayListCanvas;->drawRenderNode(Landroid/view/RenderNode;)V
-Landroid/view/FrameMetrics;->mTimingData:[J
-Landroid/view/FrameMetricsObserver;->mFrameMetrics:Landroid/view/FrameMetrics;
-Landroid/view/FrameMetricsObserver;->mMessageQueue:Landroid/os/MessageQueue;
-Landroid/view/FrameMetricsObserver;->notifyDataAvailable(I)V
-Landroid/view/GestureDetector;->mMinimumFlingVelocity:I
-Landroid/view/GestureDetector;->mTouchSlopSquare:I
-Landroid/view/GhostView;->addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroid/view/GhostView;
-Landroid/view/GhostView;->removeGhost(Landroid/view/View;)V
-Landroid/view/IAppTransitionAnimationSpecsFuture$Stub;-><init>()V
-Landroid/view/IGraphicsStats$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/view/IGraphicsStats$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IGraphicsStats;
-Landroid/view/IRecentsAnimationController;->finish(Z)V
-Landroid/view/IRecentsAnimationController;->screenshotTask(I)Landroid/app/ActivityManager$TaskSnapshot;
-Landroid/view/IRecentsAnimationController;->setAnimationTargetsBehindSystemBars(Z)V
-Landroid/view/IRecentsAnimationController;->setInputConsumerEnabled(Z)V
-Landroid/view/IRecentsAnimationRunner$Stub;-><init>()V
-Landroid/view/IRecentsAnimationRunner;->onAnimationCanceled()V
-Landroid/view/IRecentsAnimationRunner;->onAnimationStart(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;)V
-Landroid/view/IRecentsAnimationRunner;->onAnimationStart_New(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;Landroid/graphics/Rect;Landroid/graphics/Rect;)V
-Landroid/view/IRemoteAnimationFinishedCallback;->onAnimationFinished()V
-Landroid/view/IRemoteAnimationRunner$Stub;-><init>()V
-Landroid/view/IRemoteAnimationRunner;->onAnimationCancelled()V
-Landroid/view/IRemoteAnimationRunner;->onAnimationStart([Landroid/view/RemoteAnimationTarget;Landroid/view/IRemoteAnimationFinishedCallback;)V
-Landroid/view/IWindowManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/view/IWindowManager$Stub$Proxy;->getBaseDisplayDensity(I)I
-Landroid/view/IWindowManager$Stub$Proxy;->getDockedStackSide()I
-Landroid/view/IWindowManager$Stub$Proxy;->getInitialDisplayDensity(I)I
-Landroid/view/IWindowManager$Stub$Proxy;->hasNavigationBar()Z
-Landroid/view/IWindowManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IWindowManager;
-Landroid/view/IWindowManager;->createInputConsumer(Landroid/os/IBinder;Ljava/lang/String;Landroid/view/InputChannel;)V
-Landroid/view/IWindowManager;->destroyInputConsumer(Ljava/lang/String;)Z
-Landroid/view/IWindowManager;->endProlongedAnimations()V
-Landroid/view/IWindowManager;->getAnimationScale(I)F
-Landroid/view/IWindowManager;->getStableInsets(ILandroid/graphics/Rect;)V
-Landroid/view/IWindowManager;->hasNavigationBar()Z
-Landroid/view/IWindowManager;->overridePendingAppTransitionMultiThumbFuture(Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/os/IRemoteCallback;Z)V
-Landroid/view/IWindowManager;->overridePendingAppTransitionRemote(Landroid/view/RemoteAnimationAdapter;)V
-Landroid/view/IWindowManager;->setAnimationScale(IF)V
-Landroid/view/IWindowManager;->setNavBarVirtualKeyHapticFeedbackEnabled(Z)V
-Landroid/view/IWindowManager;->setShelfHeight(ZI)V
-Landroid/view/IWindowManager;->setStrictModeVisualIndicatorPreference(Ljava/lang/String;)V
-Landroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I
-Landroid/view/InputChannel;-><init>()V
-Landroid/view/InputChannel;->mPtr:J
-Landroid/view/InputDevice;-><init>(IIILjava/lang/String;IILjava/lang/String;ZIILandroid/view/KeyCharacterMap;ZZZ)V
-Landroid/view/InputDevice;->addMotionRange(IIFFFFF)V
-Landroid/view/InputDevice;->isExternal()Z
-Landroid/view/InputEvent;->getSequenceNumber()I
-Landroid/view/InputEventReceiver;->dispatchBatchedInputEventPending()V
-Landroid/view/InputEventReceiver;->dispatchInputEvent(ILandroid/view/InputEvent;I)V
-Landroid/view/InputEventReceiver;->onInputEvent(Landroid/view/InputEvent;I)V
-Landroid/view/InputEventSender;->dispatchInputEventFinished(IZ)V
-Landroid/view/InputQueue;->finishInputEvent(JZ)V
-Landroid/view/KeyCharacterMap$FallbackAction;->keyCode:I
-Landroid/view/KeyCharacterMap$FallbackAction;->metaState:I
-Landroid/view/KeyCharacterMap;-><init>(J)V
-Landroid/view/KeyEvent;->isConfirmKey(I)Z
-Landroid/view/KeyEvent;->mAction:I
-Landroid/view/KeyEvent;->mCharacters:Ljava/lang/String;
-Landroid/view/KeyEvent;->mDeviceId:I
-Landroid/view/KeyEvent;->mDownTime:J
-Landroid/view/KeyEvent;->mEventTime:J
-Landroid/view/KeyEvent;->mFlags:I
-Landroid/view/KeyEvent;->mKeyCode:I
-Landroid/view/KeyEvent;->mMetaState:I
-Landroid/view/KeyEvent;->mRepeatCount:I
-Landroid/view/KeyEvent;->mScanCode:I
-Landroid/view/KeyEvent;->mSource:I
-Landroid/view/KeyEvent;->obtain(JJIIIIIIIILjava/lang/String;)Landroid/view/KeyEvent;
-Landroid/view/KeyEvent;->recycle()V
-Landroid/view/LayoutInflater;->createViewFromTag(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
-Landroid/view/LayoutInflater;->createViewFromTag(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;Z)Landroid/view/View;
-Landroid/view/LayoutInflater;->mConstructorArgs:[Ljava/lang/Object;
-Landroid/view/LayoutInflater;->mContext:Landroid/content/Context;
-Landroid/view/LayoutInflater;->mFactory2:Landroid/view/LayoutInflater$Factory2;
-Landroid/view/LayoutInflater;->mFactory:Landroid/view/LayoutInflater$Factory;
-Landroid/view/LayoutInflater;->mFactorySet:Z
-Landroid/view/LayoutInflater;->mPrivateFactory:Landroid/view/LayoutInflater$Factory2;
-Landroid/view/LayoutInflater;->sConstructorMap:Ljava/util/HashMap;
-Landroid/view/LayoutInflater;->setPrivateFactory(Landroid/view/LayoutInflater$Factory2;)V
-Landroid/view/MotionEvent$PointerCoords;->mPackedAxisBits:J
-Landroid/view/MotionEvent$PointerCoords;->mPackedAxisValues:[F
-Landroid/view/MotionEvent;->HISTORY_CURRENT:I
-Landroid/view/MotionEvent;->getPointerIdBits()I
-Landroid/view/MotionEvent;->mNativePtr:J
-Landroid/view/MotionEvent;->nativeGetRawAxisValue(JIII)F
-Landroid/view/MotionEvent;->obtain()Landroid/view/MotionEvent;
-Landroid/view/MotionEvent;->scale(F)V
-Landroid/view/MotionEvent;->split(I)Landroid/view/MotionEvent;
-Landroid/view/PointerIcon;->load(Landroid/content/Context;)Landroid/view/PointerIcon;
-Landroid/view/PointerIcon;->mBitmap:Landroid/graphics/Bitmap;
-Landroid/view/PointerIcon;->mBitmapFrames:[Landroid/graphics/Bitmap;
-Landroid/view/PointerIcon;->mDurationPerFrame:I
-Landroid/view/PointerIcon;->mHotSpotX:F
-Landroid/view/PointerIcon;->mHotSpotY:F
-Landroid/view/PointerIcon;->mType:I
-Landroid/view/RemoteAnimationAdapter;-><init>(Landroid/view/IRemoteAnimationRunner;JJ)V
-Landroid/view/RemoteAnimationDefinition;-><init>()V
-Landroid/view/RemoteAnimationDefinition;->addRemoteAnimation(IILandroid/view/RemoteAnimationAdapter;)V
-Landroid/view/RemoteAnimationDefinition;->addRemoteAnimation(ILandroid/view/RemoteAnimationAdapter;)V
-Landroid/view/RemoteAnimationTarget;->clipRect:Landroid/graphics/Rect;
-Landroid/view/RemoteAnimationTarget;->contentInsets:Landroid/graphics/Rect;
-Landroid/view/RemoteAnimationTarget;->isNotInRecents:Z
-Landroid/view/RemoteAnimationTarget;->isTranslucent:Z
-Landroid/view/RemoteAnimationTarget;->leash:Landroid/view/SurfaceControl;
-Landroid/view/RemoteAnimationTarget;->mode:I
-Landroid/view/RemoteAnimationTarget;->position:Landroid/graphics/Point;
-Landroid/view/RemoteAnimationTarget;->prefixOrderIndex:I
-Landroid/view/RemoteAnimationTarget;->sourceContainerBounds:Landroid/graphics/Rect;
-Landroid/view/RemoteAnimationTarget;->taskId:I
-Landroid/view/RemoteAnimationTarget;->windowConfiguration:Landroid/app/WindowConfiguration;
-Landroid/view/RenderNode;->create(Ljava/lang/String;Landroid/view/View;)Landroid/view/RenderNode;
-Landroid/view/RenderNode;->discardDisplayList()V
-Landroid/view/RenderNode;->end(Landroid/view/DisplayListCanvas;)V
-Landroid/view/RenderNode;->isValid()Z
-Landroid/view/RenderNode;->output()V
-Landroid/view/RenderNode;->setClipToBounds(Z)Z
-Landroid/view/RenderNode;->setLeftTopRightBottom(IIII)Z
-Landroid/view/RenderNode;->start(II)Landroid/view/DisplayListCanvas;
-Landroid/view/RenderNodeAnimator;-><init>(IF)V
-Landroid/view/RenderNodeAnimator;->callOnFinished(Landroid/view/RenderNodeAnimator;)V
-Landroid/view/RenderNodeAnimator;->mapViewPropertyToRenderProperty(I)I
-Landroid/view/RenderNodeAnimator;->setTarget(Landroid/view/View;)V
-Landroid/view/ScaleGestureDetector;->mListener:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
-Landroid/view/ScaleGestureDetector;->mMinSpan:I
-Landroid/view/Surface;-><init>(J)V
-Landroid/view/Surface;->getNextFrameNumber()J
-Landroid/view/Surface;->mLock:Ljava/lang/Object;
-Landroid/view/Surface;->mNativeObject:J
-Landroid/view/Surface;->transferFrom(Landroid/view/Surface;)V
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;-><init>()V
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;->appVsyncOffsetNanos:J
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;->density:F
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;->height:I
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;->presentationDeadlineNanos:J
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;->refreshRate:F
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;->secure:Z
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;->width:I
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;->xDpi:F
-Landroid/view/SurfaceControl$PhysicalDisplayInfo;->yDpi:F
-Landroid/view/SurfaceControl$Transaction;-><init>()V
-Landroid/view/SurfaceControl$Transaction;->apply()V
-Landroid/view/SurfaceControl$Transaction;->deferTransactionUntil(Landroid/view/SurfaceControl;Landroid/os/IBinder;J)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->deferTransactionUntilSurface(Landroid/view/SurfaceControl;Landroid/view/Surface;J)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->hide(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->setAlpha(Landroid/view/SurfaceControl;F)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->setColor(Landroid/view/SurfaceControl;[F)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->setFinalCrop(Landroid/view/SurfaceControl;Landroid/graphics/Rect;)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->setLayer(Landroid/view/SurfaceControl;I)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->setMatrix(Landroid/view/SurfaceControl;FFFF)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->setMatrix(Landroid/view/SurfaceControl;Landroid/graphics/Matrix;[F)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->setPosition(Landroid/view/SurfaceControl;FF)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->setSize(Landroid/view/SurfaceControl;II)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->setWindowCrop(Landroid/view/SurfaceControl;Landroid/graphics/Rect;)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceControl$Transaction;->show(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction;
-Landroid/view/SurfaceSession;->mNativeClient:J
-Landroid/view/SurfaceView;->isFixedSize()Z
-Landroid/view/SurfaceView;->mCallbacks:Ljava/util/ArrayList;
-Landroid/view/SurfaceView;->mFormat:I
-Landroid/view/SurfaceView;->mRequestedFormat:I
-Landroid/view/SurfaceView;->mSurfaceHolder:Landroid/view/SurfaceHolder;
-Landroid/view/SurfaceView;->setFrame(IIII)Z
-Landroid/view/SurfaceView;->surfacePositionLost_uiRtSync(J)V
-Landroid/view/SurfaceView;->updateSurfacePosition_renderWorker(JIIII)V
-Landroid/view/TextureView;->destroyHardwareLayer()V
-Landroid/view/TextureView;->destroyHardwareResources()V
-Landroid/view/TextureView;->mLayer:Landroid/view/TextureLayer;
-Landroid/view/TextureView;->mNativeWindow:J
-Landroid/view/TextureView;->mSurface:Landroid/graphics/SurfaceTexture;
-Landroid/view/TextureView;->mUpdateListener:Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;
-Landroid/view/ThreadedRenderer;->createHardwareBitmap(Landroid/view/RenderNode;II)Landroid/graphics/Bitmap;
-Landroid/view/ThreadedRenderer;->setupDiskCache(Ljava/io/File;)V
-Landroid/view/TouchDelegate;->mDelegateTargeted:Z
-Landroid/view/VelocityTracker$Estimator;->confidence:F
-Landroid/view/VelocityTracker$Estimator;->degree:I
-Landroid/view/VelocityTracker$Estimator;->xCoeff:[F
-Landroid/view/VelocityTracker$Estimator;->yCoeff:[F
-Landroid/view/VelocityTracker;->obtain(Ljava/lang/String;)Landroid/view/VelocityTracker;
-Landroid/view/View$AttachInfo;->mContentInsets:Landroid/graphics/Rect;
-Landroid/view/View$AttachInfo;->mDrawingTime:J
-Landroid/view/View$AttachInfo;->mStableInsets:Landroid/graphics/Rect;
-Landroid/view/View$ListenerInfo;-><init>()V
-Landroid/view/View$ListenerInfo;->mOnClickListener:Landroid/view/View$OnClickListener;
-Landroid/view/View$ListenerInfo;->mOnDragListener:Landroid/view/View$OnDragListener;
-Landroid/view/View$ListenerInfo;->mOnFocusChangeListener:Landroid/view/View$OnFocusChangeListener;
-Landroid/view/View$ListenerInfo;->mOnLongClickListener:Landroid/view/View$OnLongClickListener;
-Landroid/view/View$ListenerInfo;->mOnTouchListener:Landroid/view/View$OnTouchListener;
-Landroid/view/View$ScrollabilityCache;->scrollBar:Landroid/widget/ScrollBarDrawable;
-Landroid/view/View;->STATUS_BAR_DISABLE_BACK:I
-Landroid/view/View;->STATUS_BAR_DISABLE_EXPAND:I
-Landroid/view/View;->STATUS_BAR_DISABLE_HOME:I
-Landroid/view/View;->STATUS_BAR_DISABLE_RECENT:I
-Landroid/view/View;->applyDrawableToTransparentRegion(Landroid/graphics/drawable/Drawable;Landroid/graphics/Region;)V
-Landroid/view/View;->clearAccessibilityFocus()V
-Landroid/view/View;->computeFitSystemWindows(Landroid/graphics/Rect;Landroid/graphics/Rect;)Z
-Landroid/view/View;->computeOpaqueFlags()V
-Landroid/view/View;->createSnapshot(Landroid/view/ViewDebug$CanvasProvider;Z)Landroid/graphics/Bitmap;
-Landroid/view/View;->dispatchAttachedToWindow(Landroid/view/View$AttachInfo;I)V
-Landroid/view/View;->dispatchDetachedFromWindow()V
-Landroid/view/View;->fitsSystemWindows()Z
-Landroid/view/View;->getAccessibilityDelegate()Landroid/view/View$AccessibilityDelegate;
-Landroid/view/View;->getAccessibilityViewId()I
-Landroid/view/View;->getBoundsOnScreen(Landroid/graphics/Rect;)V
-Landroid/view/View;->getHorizontalScrollFactor()F
-Landroid/view/View;->getInverseMatrix()Landroid/graphics/Matrix;
-Landroid/view/View;->getListenerInfo()Landroid/view/View$ListenerInfo;
-Landroid/view/View;->getLocationOnScreen()[I
-Landroid/view/View;->getRawTextAlignment()I
-Landroid/view/View;->getRawTextDirection()I
-Landroid/view/View;->getTransitionAlpha()F
-Landroid/view/View;->getVerticalScrollFactor()F
-Landroid/view/View;->getViewRootImpl()Landroid/view/ViewRootImpl;
-Landroid/view/View;->getWindowDisplayFrame(Landroid/graphics/Rect;)V
-Landroid/view/View;->hideTooltip()V
-Landroid/view/View;->includeForAccessibility()Z
-Landroid/view/View;->initializeFadingEdge(Landroid/content/res/TypedArray;)V
-Landroid/view/View;->initializeScrollbars(Landroid/content/res/TypedArray;)V
-Landroid/view/View;->internalSetPadding(IIII)V
-Landroid/view/View;->invalidateParentIfNeeded()V
-Landroid/view/View;->isPaddingResolved()Z
-Landroid/view/View;->isRootNamespace()Z
-Landroid/view/View;->isVisibleToUser()Z
-Landroid/view/View;->isVisibleToUser(Landroid/graphics/Rect;)Z
-Landroid/view/View;->mAccessibilityDelegate:Landroid/view/View$AccessibilityDelegate;
-Landroid/view/View;->mAttachInfo:Landroid/view/View$AttachInfo;
-Landroid/view/View;->mBackground:Landroid/graphics/drawable/Drawable;
-Landroid/view/View;->mBottom:I
-Landroid/view/View;->mContext:Landroid/content/Context;
-Landroid/view/View;->mDrawingCache:Landroid/graphics/Bitmap;
-Landroid/view/View;->mLayoutParams:Landroid/view/ViewGroup$LayoutParams;
-Landroid/view/View;->mLeft:I
-Landroid/view/View;->mListenerInfo:Landroid/view/View$ListenerInfo;
-Landroid/view/View;->mMinHeight:I
-Landroid/view/View;->mMinWidth:I
-Landroid/view/View;->mPaddingBottom:I
-Landroid/view/View;->mPaddingLeft:I
-Landroid/view/View;->mPaddingRight:I
-Landroid/view/View;->mPaddingTop:I
-Landroid/view/View;->mParent:Landroid/view/ViewParent;
-Landroid/view/View;->mPrivateFlags2:I
-Landroid/view/View;->mPrivateFlags3:I
-Landroid/view/View;->mPrivateFlags:I
-Landroid/view/View;->mRecreateDisplayList:Z
-Landroid/view/View;->mResources:Landroid/content/res/Resources;
-Landroid/view/View;->mRight:I
-Landroid/view/View;->mScrollCache:Landroid/view/View$ScrollabilityCache;
-Landroid/view/View;->mScrollX:I
-Landroid/view/View;->mScrollY:I
-Landroid/view/View;->mStartActivityRequestWho:Ljava/lang/String;
-Landroid/view/View;->mTag:Ljava/lang/Object;
-Landroid/view/View;->mTop:I
-Landroid/view/View;->mUnscaledDrawingCache:Landroid/graphics/Bitmap;
-Landroid/view/View;->mViewFlags:I
-Landroid/view/View;->notifySubtreeAccessibilityStateChangedIfNeeded()V
-Landroid/view/View;->onDrawVerticalScrollBar(Landroid/graphics/Canvas;Landroid/graphics/drawable/Drawable;IIII)V
-Landroid/view/View;->performAccessibilityActionInternal(ILandroid/os/Bundle;)Z
-Landroid/view/View;->recomputePadding()V
-Landroid/view/View;->requestAccessibilityFocus()Z
-Landroid/view/View;->resetDisplayList()V
-Landroid/view/View;->resetPaddingToInitialValues()V
-Landroid/view/View;->resetResolvedDrawables()V
-Landroid/view/View;->resetResolvedLayoutDirection()V
-Landroid/view/View;->resetResolvedPadding()V
-Landroid/view/View;->resetResolvedTextAlignment()V
-Landroid/view/View;->resetResolvedTextDirection()V
-Landroid/view/View;->resetRtlProperties()V
-Landroid/view/View;->setAlphaNoInvalidation(F)Z
-Landroid/view/View;->setAnimationMatrix(Landroid/graphics/Matrix;)V
-Landroid/view/View;->setAssistBlocked(Z)V
-Landroid/view/View;->setFrame(IIII)Z
-Landroid/view/View;->setIsRootNamespace(Z)V
-Landroid/view/View;->setLeftTopRightBottom(IIII)V
-Landroid/view/View;->setTooltip(Ljava/lang/CharSequence;)V
-Landroid/view/View;->setTransitionAlpha(F)V
-Landroid/view/View;->startActivityForResult(Landroid/content/Intent;I)V
-Landroid/view/View;->toGlobalMotionEvent(Landroid/view/MotionEvent;)Z
-Landroid/view/View;->toLocalMotionEvent(Landroid/view/MotionEvent;)Z
-Landroid/view/View;->transformMatrixToGlobal(Landroid/graphics/Matrix;)V
-Landroid/view/View;->transformMatrixToLocal(Landroid/graphics/Matrix;)V
-Landroid/view/ViewConfiguration;->getDeviceGlobalActionKeyTimeout()J
-Landroid/view/ViewConfiguration;->getDoubleTapMinTime()I
-Landroid/view/ViewConfiguration;->getScaledScrollFactor()I
-Landroid/view/ViewConfiguration;->mFadingMarqueeEnabled:Z
-Landroid/view/ViewConfiguration;->sHasPermanentMenuKey:Z
-Landroid/view/ViewConfiguration;->sHasPermanentMenuKeySet:Z
-Landroid/view/ViewDebug;->dispatchCommand(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;Ljava/io/OutputStream;)V
-Landroid/view/ViewDebug;->dump(Landroid/view/View;ZZLjava/io/OutputStream;)V
-Landroid/view/ViewGroup$MarginLayoutParams;->endMargin:I
-Landroid/view/ViewGroup$MarginLayoutParams;->startMargin:I
-Landroid/view/ViewGroup;->FLAG_SUPPORT_STATIC_TRANSFORMATIONS:I
-Landroid/view/ViewGroup;->FLAG_USE_CHILD_DRAWING_ORDER:I
-Landroid/view/ViewGroup;->dispatchViewAdded(Landroid/view/View;)V
-Landroid/view/ViewGroup;->dispatchViewRemoved(Landroid/view/View;)V
-Landroid/view/ViewGroup;->mChildren:[Landroid/view/View;
-Landroid/view/ViewGroup;->mChildrenCount:I
-Landroid/view/ViewGroup;->mFirstTouchTarget:Landroid/view/ViewGroup$TouchTarget;
-Landroid/view/ViewGroup;->mGroupFlags:I
-Landroid/view/ViewGroup;->mOnHierarchyChangeListener:Landroid/view/ViewGroup$OnHierarchyChangeListener;
-Landroid/view/ViewGroup;->mPersistentDrawingCache:I
-Landroid/view/ViewGroup;->makeOptionalFitsSystemWindows()V
-Landroid/view/ViewGroup;->offsetChildrenTopAndBottom(I)V
-Landroid/view/ViewGroup;->onChildVisibilityChanged(Landroid/view/View;II)V
-Landroid/view/ViewGroup;->resetResolvedDrawables()V
-Landroid/view/ViewGroup;->resetResolvedLayoutDirection()V
-Landroid/view/ViewGroup;->resetResolvedPadding()V
-Landroid/view/ViewGroup;->resetResolvedTextAlignment()V
-Landroid/view/ViewGroup;->resetResolvedTextDirection()V
-Landroid/view/ViewGroup;->suppressLayout(Z)V
-Landroid/view/ViewRootImpl;->detachFunctor(J)V
-Landroid/view/ViewRootImpl;->dispatchInputEvent(Landroid/view/InputEvent;)V
-Landroid/view/ViewRootImpl;->dispatchInputEvent(Landroid/view/InputEvent;Landroid/view/InputEventReceiver;)V
-Landroid/view/ViewRootImpl;->enqueueInputEvent(Landroid/view/InputEvent;)V
-Landroid/view/ViewRootImpl;->getWindowFlags()I
-Landroid/view/ViewRootImpl;->invokeFunctor(JZ)V
-Landroid/view/ViewRootImpl;->mStopped:Z
-Landroid/view/ViewRootImpl;->mSurface:Landroid/view/Surface;
-Landroid/view/ViewRootImpl;->mView:Landroid/view/View;
-Landroid/view/ViewTreeObserver$InternalInsetsInfo;->TOUCHABLE_INSETS_REGION:I
-Landroid/view/ViewTreeObserver$InternalInsetsInfo;->setTouchableInsets(I)V
-Landroid/view/ViewTreeObserver$InternalInsetsInfo;->touchableRegion:Landroid/graphics/Region;
-Landroid/view/ViewTreeObserver;->addOnComputeInternalInsetsListener(Landroid/view/ViewTreeObserver$OnComputeInternalInsetsListener;)V
-Landroid/view/ViewTreeObserver;->removeOnComputeInternalInsetsListener(Landroid/view/ViewTreeObserver$OnComputeInternalInsetsListener;)V
-Landroid/view/Window;->mAppName:Ljava/lang/String;
-Landroid/view/Window;->mAppToken:Landroid/os/IBinder;
-Landroid/view/Window;->mCallback:Landroid/view/Window$Callback;
-Landroid/view/Window;->mContext:Landroid/content/Context;
-Landroid/view/Window;->mHardwareAccelerated:Z
-Landroid/view/Window;->mWindowStyle:Landroid/content/res/TypedArray;
-Landroid/view/Window;->setNeedsMenuKey(I)V
-Landroid/view/WindowAnimationFrameStats;->init(J[J)V
-Landroid/view/WindowContentFrameStats;->init(J[J[J[J)V
-Landroid/view/WindowManager$LayoutParams;->NEEDS_MENU_SET_FALSE:I
-Landroid/view/WindowManager$LayoutParams;->NEEDS_MENU_SET_TRUE:I
-Landroid/view/WindowManager$LayoutParams;->TYPE_KEYGUARD:I
-Landroid/view/WindowManager$LayoutParams;->hideTimeoutMilliseconds:J
-Landroid/view/WindowManager$LayoutParams;->needsMenuKey:I
-Landroid/view/WindowManager$LayoutParams;->userActivityTimeout:J
-Landroid/view/WindowManagerGlobal;->getInstance()Landroid/view/WindowManagerGlobal;
-Landroid/view/WindowManagerGlobal;->getRootView(Ljava/lang/String;)Landroid/view/View;
-Landroid/view/WindowManagerGlobal;->getViewRootNames()[Ljava/lang/String;
-Landroid/view/WindowManagerGlobal;->getWindowManagerService()Landroid/view/IWindowManager;
-Landroid/view/WindowManagerGlobal;->initialize()V
-Landroid/view/WindowManagerGlobal;->mLock:Ljava/lang/Object;
-Landroid/view/WindowManagerGlobal;->mParams:Ljava/util/ArrayList;
-Landroid/view/WindowManagerGlobal;->mRoots:Ljava/util/ArrayList;
-Landroid/view/WindowManagerGlobal;->mViews:Ljava/util/ArrayList;
-Landroid/view/WindowManagerGlobal;->sDefaultWindowManager:Landroid/view/WindowManagerGlobal;
-Landroid/view/WindowManagerGlobal;->sWindowManagerService:Landroid/view/IWindowManager;
-Landroid/view/WindowManagerGlobal;->sWindowSession:Landroid/view/IWindowSession;
-Landroid/view/WindowManagerGlobal;->trimMemory(I)V
-Landroid/view/WindowManagerImpl;->mGlobal:Landroid/view/WindowManagerGlobal;
-Landroid/view/accessibility/AccessibilityInteractionClient;->clearCache()V
-Landroid/view/accessibility/AccessibilityInteractionClient;->getInstance()Landroid/view/accessibility/AccessibilityInteractionClient;
-Landroid/view/accessibility/AccessibilityManager;->getInstance(Landroid/content/Context;)Landroid/view/accessibility/AccessibilityManager;
-Landroid/view/accessibility/AccessibilityManager;->isHighTextContrastEnabled()Z
-Landroid/view/accessibility/AccessibilityManager;->mAccessibilityStateChangeListeners:Landroid/util/ArrayMap;
-Landroid/view/accessibility/AccessibilityManager;->mIsEnabled:Z
-Landroid/view/accessibility/AccessibilityManager;->mIsHighTextContrastEnabled:Z
-Landroid/view/accessibility/AccessibilityManager;->sInstance:Landroid/view/accessibility/AccessibilityManager;
-Landroid/view/accessibility/AccessibilityManager;->sInstanceSync:Ljava/lang/Object;
-Landroid/view/accessibility/AccessibilityNodeInfo;->isSealed()Z
-Landroid/view/accessibility/AccessibilityNodeInfo;->mChildNodeIds:Landroid/util/LongArray;
-Landroid/view/accessibility/AccessibilityNodeInfo;->mSealed:Z
-Landroid/view/accessibility/AccessibilityNodeInfo;->refresh(Landroid/os/Bundle;Z)Z
-Landroid/view/accessibility/AccessibilityNodeInfo;->setSealed(Z)V
-Landroid/view/accessibility/AccessibilityRecord;->getSourceNodeId()J
-Landroid/view/accessibility/IAccessibilityManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/view/accessibility/IAccessibilityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/accessibility/IAccessibilityManager;
-Landroid/view/accessibility/IAccessibilityManager;->getEnabledAccessibilityServiceList(II)Ljava/util/List;
-Landroid/view/animation/Animation;->detach()V
-Landroid/view/animation/Animation;->initializeInvalidateRegion(IIII)V
-Landroid/view/animation/Animation;->mListener:Landroid/view/animation/Animation$AnimationListener;
-Landroid/view/autofill/IAutoFillManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/view/inputmethod/InputMethodInfo;->mSubtypes:Landroid/view/inputmethod/InputMethodSubtypeArray;
-Landroid/view/inputmethod/InputMethodManager;->finishInputLocked()V
-Landroid/view/inputmethod/InputMethodManager;->focusIn(Landroid/view/View;)V
-Landroid/view/inputmethod/InputMethodManager;->focusOut(Landroid/view/View;)V
-Landroid/view/inputmethod/InputMethodManager;->getClient()Lcom/android/internal/view/IInputMethodClient;
-Landroid/view/inputmethod/InputMethodManager;->getInputMethodWindowVisibleHeight()I
-Landroid/view/inputmethod/InputMethodManager;->getInstance()Landroid/view/inputmethod/InputMethodManager;
-Landroid/view/inputmethod/InputMethodManager;->mCurId:Ljava/lang/String;
-Landroid/view/inputmethod/InputMethodManager;->mCurRootView:Landroid/view/View;
-Landroid/view/inputmethod/InputMethodManager;->mH:Landroid/view/inputmethod/InputMethodManager$H;
-Landroid/view/inputmethod/InputMethodManager;->mNextServedView:Landroid/view/View;
-Landroid/view/inputmethod/InputMethodManager;->mServedInputConnectionWrapper:Landroid/view/inputmethod/InputMethodManager$ControlledInputConnectionWrapper;
-Landroid/view/inputmethod/InputMethodManager;->mServedView:Landroid/view/View;
-Landroid/view/inputmethod/InputMethodManager;->mService:Lcom/android/internal/view/IInputMethodManager;
-Landroid/view/inputmethod/InputMethodManager;->notifyUserAction()V
-Landroid/view/inputmethod/InputMethodManager;->peekInstance()Landroid/view/inputmethod/InputMethodManager;
-Landroid/view/inputmethod/InputMethodManager;->sInstance:Landroid/view/inputmethod/InputMethodManager;
-Landroid/view/inputmethod/InputMethodManager;->showSoftInputUnchecked(ILandroid/os/ResultReceiver;)V
-Landroid/view/inputmethod/InputMethodManager;->windowDismissed(Landroid/os/IBinder;)V
-Landroid/view/inputmethod/InputMethodSubtypeArray;-><init>(Ljava/util/List;)V
-Landroid/view/textclassifier/TextClassificationManager;->getTextClassifier(I)Landroid/view/textclassifier/TextClassifier;
-Landroid/view/textclassifier/TextClassifier;->classifyText(Ljava/lang/CharSequence;IILandroid/view/textclassifier/TextClassification$Options;)Landroid/view/textclassifier/TextClassification;
-Landroid/view/textclassifier/TextClassifier;->generateLinks(Ljava/lang/CharSequence;Landroid/view/textclassifier/TextLinks$Options;)Landroid/view/textclassifier/TextLinks;
-Landroid/view/textclassifier/TextClassifier;->suggestSelection(Ljava/lang/CharSequence;IILandroid/view/textclassifier/TextSelection$Options;)Landroid/view/textclassifier/TextSelection;
-Landroid/view/textclassifier/TextLinks$Options;-><init>()V
-Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionAction(III)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;
-Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionAction(IIILandroid/view/textclassifier/TextClassification;)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;
-Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionModified(II)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;
-Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionModified(IILandroid/view/textclassifier/TextClassification;)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;
-Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionModified(IILandroid/view/textclassifier/TextSelection;)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;
-Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionStarted(I)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;
-Landroid/view/textclassifier/logging/SmartSelectionEventTracker;-><init>(Landroid/content/Context;I)V
-Landroid/view/textclassifier/logging/SmartSelectionEventTracker;->logEvent(Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;)V
-Landroid/view/textservice/TextServicesManager;->isSpellCheckerEnabled()Z
-Landroid/webkit/CacheManager$CacheResult;-><init>()V
-Landroid/webkit/CacheManager$CacheResult;->getContentDisposition()Ljava/lang/String;
-Landroid/webkit/CacheManager$CacheResult;->getContentLength()J
-Landroid/webkit/CacheManager$CacheResult;->getETag()Ljava/lang/String;
-Landroid/webkit/CacheManager$CacheResult;->getEncoding()Ljava/lang/String;
-Landroid/webkit/CacheManager$CacheResult;->getExpires()J
-Landroid/webkit/CacheManager$CacheResult;->getExpiresString()Ljava/lang/String;
-Landroid/webkit/CacheManager$CacheResult;->getHttpStatusCode()I
-Landroid/webkit/CacheManager$CacheResult;->getInputStream()Ljava/io/InputStream;
-Landroid/webkit/CacheManager$CacheResult;->getLastModified()Ljava/lang/String;
-Landroid/webkit/CacheManager$CacheResult;->getLocalPath()Ljava/lang/String;
-Landroid/webkit/CacheManager$CacheResult;->getLocation()Ljava/lang/String;
-Landroid/webkit/CacheManager$CacheResult;->getMimeType()Ljava/lang/String;
-Landroid/webkit/CacheManager$CacheResult;->getOutputStream()Ljava/io/OutputStream;
-Landroid/webkit/CacheManager$CacheResult;->setEncoding(Ljava/lang/String;)V
-Landroid/webkit/CacheManager$CacheResult;->setInputStream(Ljava/io/InputStream;)V
-Landroid/webkit/CacheManager;->cacheDisabled()Z
-Landroid/webkit/CacheManager;->endCacheTransaction()Z
-Landroid/webkit/CacheManager;->getCacheFile(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/CacheManager$CacheResult;
-Landroid/webkit/CacheManager;->getCacheFileBaseDir()Ljava/io/File;
-Landroid/webkit/CacheManager;->saveCacheFile(Ljava/lang/String;Landroid/webkit/CacheManager$CacheResult;)V
-Landroid/webkit/CacheManager;->startCacheTransaction()Z
-Landroid/webkit/IWebViewUpdateService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/webkit/WebResourceResponse;->mImmutable:Z
-Landroid/webkit/WebSettings$TextSize;->value:I
-Landroid/webkit/WebSettings;->getPluginsPath()Ljava/lang/String;
-Landroid/webkit/WebSettings;->getUseDoubleTree()Z
-Landroid/webkit/WebSettings;->setPluginsPath(Ljava/lang/String;)V
-Landroid/webkit/WebSettings;->setUseDoubleTree(Z)V
-Landroid/webkit/WebSyncManager;->mHandler:Landroid/os/Handler;
-Landroid/webkit/WebView;->debugDump()V
-Landroid/webkit/WebView;->disablePlatformNotifications()V
-Landroid/webkit/WebView;->emulateShiftHeld()V
-Landroid/webkit/WebView;->enablePlatformNotifications()V
-Landroid/webkit/WebView;->getContentWidth()I
-Landroid/webkit/WebView;->getPluginList()Landroid/webkit/PluginList;
-Landroid/webkit/WebView;->getTouchIconUrl()Ljava/lang/String;
-Landroid/webkit/WebView;->getVisibleTitleHeight()I
-Landroid/webkit/WebView;->getZoomControls()Landroid/view/View;
-Landroid/webkit/WebView;->isPaused()Z
-Landroid/webkit/WebView;->mProvider:Landroid/webkit/WebViewProvider;
-Landroid/webkit/WebView;->notifyFindDialogDismissed()V
-Landroid/webkit/WebView;->onDrawVerticalScrollBar(Landroid/graphics/Canvas;Landroid/graphics/drawable/Drawable;IIII)V
-Landroid/webkit/WebView;->refreshPlugins(Z)V
-Landroid/webkit/WebView;->restorePicture(Landroid/os/Bundle;Ljava/io/File;)Z
-Landroid/webkit/WebView;->sEnforceThreadChecking:Z
-Landroid/webkit/WebView;->savePicture(Landroid/os/Bundle;Ljava/io/File;)Z
-Landroid/webkit/WebViewClient;->onUnhandledInputEvent(Landroid/webkit/WebView;Landroid/view/InputEvent;)V
-Landroid/webkit/WebViewDelegate;-><init>()V
-Landroid/webkit/WebViewFactory;->getProvider()Landroid/webkit/WebViewFactoryProvider;
-Landroid/webkit/WebViewFactory;->getUpdateService()Landroid/webkit/IWebViewUpdateService;
-Landroid/webkit/WebViewFactory;->getWebViewContextAndSetProvider()Landroid/content/Context;
-Landroid/webkit/WebViewFactory;->sPackageInfo:Landroid/content/pm/PackageInfo;
-Landroid/webkit/WebViewFactory;->sProviderInstance:Landroid/webkit/WebViewFactoryProvider;
-Landroid/widget/AbsListView$FlingRunnable;->endFling()V
-Landroid/widget/AbsListView$FlingRunnable;->mScroller:Landroid/widget/OverScroller;
-Landroid/widget/AbsListView$FlingRunnable;->start(I)V
-Landroid/widget/AbsListView$RecycleBin;->clear()V
-Landroid/widget/AbsListView$RecycleBin;->mRecyclerListener:Landroid/widget/AbsListView$RecyclerListener;
-Landroid/widget/AbsListView$SavedState;->firstId:J
-Landroid/widget/AbsListView$SavedState;->viewTop:I
-Landroid/widget/AbsListView;->invokeOnItemScrollListener()V
-Landroid/widget/AbsListView;->isVerticalScrollBarHidden()Z
-Landroid/widget/AbsListView;->mAdapter:Landroid/widget/ListAdapter;
-Landroid/widget/AbsListView;->mDataSetObserver:Landroid/widget/AbsListView$AdapterDataSetObserver;
-Landroid/widget/AbsListView;->mEdgeGlowBottom:Landroid/widget/EdgeEffect;
-Landroid/widget/AbsListView;->mEdgeGlowTop:Landroid/widget/EdgeEffect;
-Landroid/widget/AbsListView;->mFastScroll:Landroid/widget/FastScroller;
-Landroid/widget/AbsListView;->mFlingRunnable:Landroid/widget/AbsListView$FlingRunnable;
-Landroid/widget/AbsListView;->mIsChildViewEnabled:Z
-Landroid/widget/AbsListView;->mLayoutMode:I
-Landroid/widget/AbsListView;->mMaximumVelocity:I
-Landroid/widget/AbsListView;->mMotionPosition:I
-Landroid/widget/AbsListView;->mOnScrollListener:Landroid/widget/AbsListView$OnScrollListener;
-Landroid/widget/AbsListView;->mPendingCheckForLongPress:Landroid/widget/AbsListView$CheckForLongPress;
-Landroid/widget/AbsListView;->mPendingCheckForTap:Landroid/widget/AbsListView$CheckForTap;
-Landroid/widget/AbsListView;->mRecycler:Landroid/widget/AbsListView$RecycleBin;
-Landroid/widget/AbsListView;->mSelectionTopPadding:I
-Landroid/widget/AbsListView;->mSelectorPosition:I
-Landroid/widget/AbsListView;->mSelectorRect:Landroid/graphics/Rect;
-Landroid/widget/AbsListView;->mTouchMode:I
-Landroid/widget/AbsListView;->mTouchSlop:I
-Landroid/widget/AbsListView;->mVelocityTracker:Landroid/view/VelocityTracker;
-Landroid/widget/AbsListView;->performLongPress(Landroid/view/View;IJ)Z
-Landroid/widget/AbsListView;->performLongPress(Landroid/view/View;IJFF)Z
-Landroid/widget/AbsListView;->reportScrollStateChange(I)V
-Landroid/widget/AbsListView;->smoothScrollBy(IIZZ)V
-Landroid/widget/AbsListView;->trackMotionScroll(II)Z
-Landroid/widget/AbsSeekBar;->mIsDragging:Z
-Landroid/widget/AbsSeekBar;->mSplitTrack:Z
-Landroid/widget/AbsSeekBar;->mThumb:Landroid/graphics/drawable/Drawable;
-Landroid/widget/AbsSeekBar;->mTouchProgressOffset:F
-Landroid/widget/ActivityChooserModel;->get(Landroid/content/Context;Ljava/lang/String;)Landroid/widget/ActivityChooserModel;
-Landroid/widget/ActivityChooserView;->setExpandActivityOverflowButtonDrawable(Landroid/graphics/drawable/Drawable;)V
-Landroid/widget/AdapterView;->mDataChanged:Z
-Landroid/widget/AdapterView;->mFirstPosition:I
-Landroid/widget/AdapterView;->mNextSelectedPosition:I
-Landroid/widget/AdapterView;->mNextSelectedRowId:J
-Landroid/widget/AdapterView;->mOldSelectedPosition:I
-Landroid/widget/AdapterView;->setNextSelectedPositionInt(I)V
-Landroid/widget/AdapterView;->setSelectedPositionInt(I)V
-Landroid/widget/AutoCompleteTextView;->doAfterTextChanged()V
-Landroid/widget/AutoCompleteTextView;->doBeforeTextChanged()V
-Landroid/widget/AutoCompleteTextView;->ensureImeVisible(Z)V
-Landroid/widget/AutoCompleteTextView;->mPopup:Landroid/widget/ListPopupWindow;
-Landroid/widget/AutoCompleteTextView;->setDropDownAlwaysVisible(Z)V
-Landroid/widget/AutoCompleteTextView;->setForceIgnoreOutsideTouch(Z)V
-Landroid/widget/BaseAdapter;->mDataSetObservable:Landroid/database/DataSetObservable;
-Landroid/widget/CompoundButton;->mBroadcasting:Z
-Landroid/widget/CompoundButton;->mButtonDrawable:Landroid/graphics/drawable/Drawable;
-Landroid/widget/CompoundButton;->mOnCheckedChangeListener:Landroid/widget/CompoundButton$OnCheckedChangeListener;
-Landroid/widget/CursorAdapter;->mChangeObserver:Landroid/widget/CursorAdapter$ChangeObserver;
-Landroid/widget/CursorAdapter;->mDataSetObserver:Landroid/database/DataSetObserver;
-Landroid/widget/CursorAdapter;->mDataValid:Z
-Landroid/widget/CursorAdapter;->mRowIDColumn:I
-Landroid/widget/DatePicker;->mDelegate:Landroid/widget/DatePicker$DatePickerDelegate;
-Landroid/widget/EdgeEffect;->mPaint:Landroid/graphics/Paint;
-Landroid/widget/Editor;->invalidateTextDisplayList()V
-Landroid/widget/Editor;->mSelectHandleLeft:Landroid/graphics/drawable/Drawable;
-Landroid/widget/Editor;->mShowCursor:J
-Landroid/widget/Editor;->mShowSoftInputOnFocus:Z
-Landroid/widget/ExpandableListView;->mChildDivider:Landroid/graphics/drawable/Drawable;
-Landroid/widget/ExpandableListView;->mGroupIndicator:Landroid/graphics/drawable/Drawable;
-Landroid/widget/FastScroller;->mContainerRect:Landroid/graphics/Rect;
-Landroid/widget/FastScroller;->mHeaderCount:I
-Landroid/widget/FastScroller;->mLongList:Z
-Landroid/widget/FastScroller;->mMinimumTouchTarget:I
-Landroid/widget/FastScroller;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-Landroid/widget/FastScroller;->mThumbImage:Landroid/widget/ImageView;
-Landroid/widget/FastScroller;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
-Landroid/widget/FastScroller;->mTrackImage:Landroid/widget/ImageView;
-Landroid/widget/Gallery$FlingRunnable;->startUsingVelocity(I)V
-Landroid/widget/Gallery;->fillToGalleryLeft()V
-Landroid/widget/Gallery;->fillToGalleryRight()V
-Landroid/widget/Gallery;->mDownTouchPosition:I
-Landroid/widget/Gallery;->mDownTouchView:Landroid/view/View;
-Landroid/widget/Gallery;->mFlingRunnable:Landroid/widget/Gallery$FlingRunnable;
-Landroid/widget/Gallery;->mSpacing:I
-Landroid/widget/Gallery;->makeAndAddView(IIIZ)Landroid/view/View;
-Landroid/widget/Gallery;->moveDirection(I)Z
-Landroid/widget/GridView;->fillDown(II)Landroid/view/View;
-Landroid/widget/GridView;->fillUp(II)Landroid/view/View;
-Landroid/widget/GridView;->mColumnWidth:I
-Landroid/widget/GridView;->mHorizontalSpacing:I
-Landroid/widget/GridView;->mNumColumns:I
-Landroid/widget/GridView;->mRequestedNumColumns:I
-Landroid/widget/GridView;->mVerticalSpacing:I
-Landroid/widget/HorizontalScrollView;->mChildToScrollTo:Landroid/view/View;
-Landroid/widget/HorizontalScrollView;->mEdgeGlowLeft:Landroid/widget/EdgeEffect;
-Landroid/widget/HorizontalScrollView;->mEdgeGlowRight:Landroid/widget/EdgeEffect;
-Landroid/widget/HorizontalScrollView;->mScroller:Landroid/widget/OverScroller;
-Landroid/widget/ImageView;->animateTransform(Landroid/graphics/Matrix;)V
-Landroid/widget/ImageView;->mAdjustViewBounds:Z
-Landroid/widget/ImageView;->mAlpha:I
-Landroid/widget/ImageView;->mDrawMatrix:Landroid/graphics/Matrix;
-Landroid/widget/ImageView;->mMaxHeight:I
-Landroid/widget/ImageView;->mMaxWidth:I
-Landroid/widget/ImageView;->mRecycleableBitmapDrawable:Landroid/graphics/drawable/BitmapDrawable;
-Landroid/widget/ImageView;->mResource:I
-Landroid/widget/ImageView;->mUri:Landroid/net/Uri;
-Landroid/widget/ImageView;->updateDrawable(Landroid/graphics/drawable/Drawable;)V
-Landroid/widget/LinearLayout;->mGravity:I
-Landroid/widget/LinearLayout;->mUseLargestChild:Z
-Landroid/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow;
-Landroid/widget/ListPopupWindow;->setForceIgnoreOutsideTouch(Z)V
-Landroid/widget/ListView;->fillDown(II)Landroid/view/View;
-Landroid/widget/ListView;->fillSpecific(II)Landroid/view/View;
-Landroid/widget/ListView;->fillUp(II)Landroid/view/View;
-Landroid/widget/ListView;->findViewTraversal(I)Landroid/view/View;
-Landroid/widget/ListView;->findViewWithTagTraversal(Ljava/lang/Object;)Landroid/view/View;
-Landroid/widget/ListView;->lookForSelectablePosition(IZ)I
-Landroid/widget/ListView;->mAreAllItemsSelectable:Z
-Landroid/widget/ListView;->mFooterViewInfos:Ljava/util/ArrayList;
-Landroid/widget/ListView;->mHeaderViewInfos:Ljava/util/ArrayList;
-Landroid/widget/ListView;->setSelectionInt(I)V
-Landroid/widget/MediaController;->mAnchor:Landroid/view/View;
-Landroid/widget/MediaController;->mDecor:Landroid/view/View;
-Landroid/widget/MediaController;->mDecorLayoutParams:Landroid/view/WindowManager$LayoutParams;
-Landroid/widget/MediaController;->mWindowManager:Landroid/view/WindowManager;
-Landroid/widget/NumberPicker;->mInputText:Landroid/widget/EditText;
-Landroid/widget/NumberPicker;->mSelectionDivider:Landroid/graphics/drawable/Drawable;
-Landroid/widget/NumberPicker;->mSelectorWheelPaint:Landroid/graphics/Paint;
-Landroid/widget/OverScroller$SplineOverScroller;->mCurrVelocity:F
-Landroid/widget/OverScroller;->isScrollingInDirection(FF)Z
-Landroid/widget/OverScroller;->mScrollerY:Landroid/widget/OverScroller$SplineOverScroller;
-Landroid/widget/PopupMenu;->mPopup:Lcom/android/internal/view/menu/MenuPopupHelper;
-Landroid/widget/PopupWindow;->computeAnimationResource()I
-Landroid/widget/PopupWindow;->createPopupLayoutParams(Landroid/os/IBinder;)Landroid/view/WindowManager$LayoutParams;
-Landroid/widget/PopupWindow;->invokePopup(Landroid/view/WindowManager$LayoutParams;)V
-Landroid/widget/PopupWindow;->mAboveAnchor:Z
-Landroid/widget/PopupWindow;->mAnchor:Ljava/lang/ref/WeakReference;
-Landroid/widget/PopupWindow;->mAnimationStyle:I
-Landroid/widget/PopupWindow;->mBackgroundView:Landroid/view/View;
-Landroid/widget/PopupWindow;->mContentView:Landroid/view/View;
-Landroid/widget/PopupWindow;->mHeightMode:I
-Landroid/widget/PopupWindow;->mIsDropdown:Z
-Landroid/widget/PopupWindow;->mIsShowing:Z
-Landroid/widget/PopupWindow;->mLastHeight:I
-Landroid/widget/PopupWindow;->mLastWidth:I
-Landroid/widget/PopupWindow;->mOnScrollChangedListener:Landroid/view/ViewTreeObserver$OnScrollChangedListener;
-Landroid/widget/PopupWindow;->mOverlapAnchor:Z
-Landroid/widget/PopupWindow;->mTouchInterceptor:Landroid/view/View$OnTouchListener;
-Landroid/widget/PopupWindow;->mWidthMode:I
-Landroid/widget/PopupWindow;->mWindowLayoutType:I
-Landroid/widget/PopupWindow;->preparePopup(Landroid/view/WindowManager$LayoutParams;)V
-Landroid/widget/PopupWindow;->setClipToScreenEnabled(Z)V
-Landroid/widget/PopupWindow;->setEpicenterBounds(Landroid/graphics/Rect;)V
-Landroid/widget/PopupWindow;->setLayoutInScreenEnabled(Z)V
-Landroid/widget/PopupWindow;->setLayoutInsetDecor(Z)V
-Landroid/widget/PopupWindow;->setTouchModal(Z)V
-Landroid/widget/PopupWindow;->showAtLocation(Landroid/os/IBinder;III)V
-Landroid/widget/ProgressBar;->mCurrentDrawable:Landroid/graphics/drawable/Drawable;
-Landroid/widget/ProgressBar;->mDuration:I
-Landroid/widget/ProgressBar;->mIndeterminate:Z
-Landroid/widget/ProgressBar;->mMaxHeight:I
-Landroid/widget/ProgressBar;->mMinHeight:I
-Landroid/widget/ProgressBar;->mOnlyIndeterminate:Z
-Landroid/widget/ProgressBar;->setProgressInternal(IZZ)Z
-Landroid/widget/RelativeLayout$LayoutParams;->mBottom:I
-Landroid/widget/RelativeLayout$LayoutParams;->mLeft:I
-Landroid/widget/RelativeLayout$LayoutParams;->mRight:I
-Landroid/widget/RelativeLayout$LayoutParams;->mTop:I
-Landroid/widget/RelativeLayout;->mGravity:I
-Landroid/widget/RemoteViews$Action;->mergeBehavior()I
-Landroid/widget/RemoteViews$Action;->viewId:I
-Landroid/widget/RemoteViews$BitmapCache;->mBitmaps:Ljava/util/ArrayList;
-Landroid/widget/RemoteViews$BitmapReflectionAction;->bitmap:Landroid/graphics/Bitmap;
-Landroid/widget/RemoteViews$BitmapReflectionAction;->methodName:Ljava/lang/String;
-Landroid/widget/RemoteViews$ReflectionAction;->methodName:Ljava/lang/String;
-Landroid/widget/RemoteViews$ReflectionAction;->value:Ljava/lang/Object;
-Landroid/widget/RemoteViews$SetOnClickPendingIntent;->pendingIntent:Landroid/app/PendingIntent;
-Landroid/widget/RemoteViews$SetPendingIntentTemplate;->pendingIntentTemplate:Landroid/app/PendingIntent;
-Landroid/widget/RemoteViews$ViewGroupActionAdd;->mNestedViews:Landroid/widget/RemoteViews;
-Landroid/widget/RemoteViews;->estimateMemoryUsage()I
-Landroid/widget/RemoteViews;->mActions:Ljava/util/ArrayList;
-Landroid/widget/RemoteViews;->mApplication:Landroid/content/pm/ApplicationInfo;
-Landroid/widget/RemoteViews;->mBitmapCache:Landroid/widget/RemoteViews$BitmapCache;
-Landroid/widget/RemoteViews;->mLayoutId:I
-Landroid/widget/RemoteViews;->mPortrait:Landroid/widget/RemoteViews;
-Landroid/widget/RemoteViews;->mergeRemoteViews(Landroid/widget/RemoteViews;)V
-Landroid/widget/RemoteViewsAdapter;->mCache:Landroid/widget/RemoteViewsAdapter$FixedSizeRemoteViewsCache;
-Landroid/widget/RemoteViewsAdapter;->mWorkerThread:Landroid/os/HandlerThread;
-Landroid/widget/ScrollBarDrawable;->mVerticalThumb:Landroid/graphics/drawable/Drawable;
-Landroid/widget/ScrollBarDrawable;->setHorizontalThumbDrawable(Landroid/graphics/drawable/Drawable;)V
-Landroid/widget/ScrollBarDrawable;->setVerticalThumbDrawable(Landroid/graphics/drawable/Drawable;)V
-Landroid/widget/ScrollView;->mChildToScrollTo:Landroid/view/View;
-Landroid/widget/ScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeEffect;
-Landroid/widget/ScrollView;->mEdgeGlowTop:Landroid/widget/EdgeEffect;
-Landroid/widget/ScrollView;->mIsBeingDragged:Z
-Landroid/widget/ScrollView;->mMinimumVelocity:I
-Landroid/widget/ScrollView;->mOverflingDistance:I
-Landroid/widget/ScrollView;->mOverscrollDistance:I
-Landroid/widget/ScrollView;->mScroller:Landroid/widget/OverScroller;
-Landroid/widget/Scroller;->mInterpolator:Landroid/view/animation/Interpolator;
-Landroid/widget/SearchView;->mCloseButton:Landroid/widget/ImageView;
-Landroid/widget/SearchView;->mSearchButton:Landroid/widget/ImageView;
-Landroid/widget/SearchView;->mSearchPlate:Landroid/view/View;
-Landroid/widget/SearchView;->mSearchSrcTextView:Landroid/widget/SearchView$SearchAutoComplete;
-Landroid/widget/SearchView;->onCloseClicked()V
-Landroid/widget/SearchView;->setQuery(Ljava/lang/CharSequence;)V
-Landroid/widget/SlidingDrawer;->mTopOffset:I
-Landroid/widget/Spinner;->mPopup:Landroid/widget/Spinner$SpinnerPopup;
-Landroid/widget/Switch;->mThumbDrawable:Landroid/graphics/drawable/Drawable;
-Landroid/widget/Switch;->mTrackDrawable:Landroid/graphics/drawable/Drawable;
-Landroid/widget/TabHost$IntentContentStrategy;->getContentView()Landroid/view/View;
-Landroid/widget/TabHost$IntentContentStrategy;->tabClosed()V
-Landroid/widget/TabHost$TabSpec;->mContentStrategy:Landroid/widget/TabHost$ContentStrategy;
-Landroid/widget/TabHost$TabSpec;->mIndicatorStrategy:Landroid/widget/TabHost$IndicatorStrategy;
-Landroid/widget/TabHost;->mTabSpecs:Ljava/util/List;
-Landroid/widget/TabWidget;->mDrawBottomStrips:Z
-Landroid/widget/TabWidget;->mSelectedTab:I
-Landroid/widget/TabWidget;->setTabSelectionListener(Landroid/widget/TabWidget$OnTabSelectionChanged;)V
-Landroid/widget/TextView;->LINES:I
-Landroid/widget/TextView;->assumeLayout()V
-Landroid/widget/TextView;->createEditorIfNeeded()V
-Landroid/widget/TextView;->getHorizontallyScrolling()Z
-Landroid/widget/TextView;->getTextColor(Landroid/content/Context;Landroid/content/res/TypedArray;I)I
-Landroid/widget/TextView;->getTextColors(Landroid/content/Context;Landroid/content/res/TypedArray;)Landroid/content/res/ColorStateList;
-Landroid/widget/TextView;->isSingleLine()Z
-Landroid/widget/TextView;->mCurTextColor:I
-Landroid/widget/TextView;->mCursorDrawableRes:I
-Landroid/widget/TextView;->mEditor:Landroid/widget/Editor;
-Landroid/widget/TextView;->mListeners:Ljava/util/ArrayList;
-Landroid/widget/TextView;->mMarquee:Landroid/widget/TextView$Marquee;
-Landroid/widget/TextView;->mMaxMode:I
-Landroid/widget/TextView;->mMaximum:I
-Landroid/widget/TextView;->mSingleLine:Z
-Landroid/widget/TextView;->mText:Ljava/lang/CharSequence;
-Landroid/widget/TextView;->mTextPaint:Landroid/text/TextPaint;
-Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;ZI)V
-Landroid/widget/Toast$TN;->mNextView:Landroid/view/View;
-Landroid/widget/Toast$TN;->mParams:Landroid/view/WindowManager$LayoutParams;
-Landroid/widget/Toast$TN;->mView:Landroid/view/View;
-Landroid/widget/Toast;->getService()Landroid/app/INotificationManager;
-Landroid/widget/Toast;->getWindowParams()Landroid/view/WindowManager$LayoutParams;
-Landroid/widget/Toast;->mDuration:I
-Landroid/widget/Toast;->mTN:Landroid/widget/Toast$TN;
-Landroid/widget/Toast;->sService:Landroid/app/INotificationManager;
-Landroid/widget/VideoView2$OnViewTypeChangedListener;->onViewTypeChanged(Landroid/view/View;I)V
-Landroid/widget/VideoView2;->getMediaController()Landroid/media/session/MediaController;
-Landroid/widget/VideoView2;->setOnViewTypeChangedListener(Landroid/widget/VideoView2$OnViewTypeChangedListener;)V
-Landroid/widget/VideoView2;->setVideoPath(Ljava/lang/String;)V
-Landroid/widget/VideoView;->mCurrentBufferPercentage:I
-Landroid/widget/VideoView;->mMediaController:Landroid/widget/MediaController;
-Landroid/widget/VideoView;->mSHCallback:Landroid/view/SurfaceHolder$Callback;
-Landroid/widget/VideoView;->mUri:Landroid/net/Uri;
-Landroid/widget/VideoView;->mVideoHeight:I
-Landroid/widget/VideoView;->mVideoWidth:I
-Lcom/android/i18n/phonenumbers/Phonemetadata$NumberFormat;->serialVersionUID:J
-Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->serialVersionUID:J
-Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadataCollection;->serialVersionUID:J
-Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneNumberDesc;->serialVersionUID:J
-Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;->serialVersionUID:J
-Lcom/android/ims/ImsConfigListener;->onSetFeatureResponse(IIII)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionConferenceStateUpdated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsConferenceState;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHandover(Lcom/android/ims/internal/IImsCallSession;IILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHandoverFailed(Lcom/android/ims/internal/IImsCallSession;IILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHeld(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHoldFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHoldReceived(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionInviteParticipantsRequestDelivered(Lcom/android/ims/internal/IImsCallSession;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionInviteParticipantsRequestFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMergeComplete(Lcom/android/ims/internal/IImsCallSession;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMergeFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMergeStarted(Lcom/android/ims/internal/IImsCallSession;Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMultipartyStateChanged(Lcom/android/ims/internal/IImsCallSession;Z)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionProgressing(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsStreamMediaProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionResumeFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionResumeReceived(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionResumed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionStartFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionStarted(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionSuppServiceReceived(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsSuppServiceNotification;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionTerminated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionTtyModeReceived(Lcom/android/ims/internal/IImsCallSession;I)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionUpdated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationAssociatedUriChanged([Landroid/net/Uri;)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationChangeFailed(ILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationConnectedWithRadioTech(I)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationDisconnected(Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationFeatureCapabilityChanged(I[I[I)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationProgressingWithRadioTech(I)V
-Lcom/android/ims/internal/IImsRegistrationListener;->voiceMessageCountUpdate(I)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationCallBarringQueried(Lcom/android/ims/internal/IImsUt;I[Landroid/telephony/ims/ImsSsInfo;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationCallForwardQueried(Lcom/android/ims/internal/IImsUt;I[Landroid/telephony/ims/ImsCallForwardInfo;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationCallWaitingQueried(Lcom/android/ims/internal/IImsUt;I[Landroid/telephony/ims/ImsSsInfo;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationQueried(Lcom/android/ims/internal/IImsUt;ILandroid/os/Bundle;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationQueryFailed(Lcom/android/ims/internal/IImsUt;ILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationUpdateFailed(Lcom/android/ims/internal/IImsUt;ILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationUpdated(Lcom/android/ims/internal/IImsUt;I)V
-Lcom/android/ims/internal/uce/common/CapInfo;-><init>()V
-Lcom/android/ims/internal/uce/common/CapInfo;->getCapTimestamp()J
-Lcom/android/ims/internal/uce/common/CapInfo;->isCdViaPresenceSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isFtHttpSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isFtSnFSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isFtSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isFtThumbSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isFullSnFGroupChatSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isGeoPullFtSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isGeoPullSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isGeoPushSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isImSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isIpVideoSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isIpVoiceSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isIsSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isRcsIpVideoCallSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isRcsIpVideoOnlyCallSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isRcsIpVoiceCallSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isSmSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isSpSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isVsDuringCSSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->isVsSupported()Z
-Lcom/android/ims/internal/uce/common/CapInfo;->setCapTimestamp(J)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setCdViaPresenceSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setExts([Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setFtHttpSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setFtSnFSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setFtSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setFtThumbSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setFullSnFGroupChatSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setGeoPullFtSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setGeoPullSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setGeoPushSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setImSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setIpVideoSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setIpVoiceSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setIsSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setRcsIpVideoCallSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setRcsIpVideoOnlyCallSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setRcsIpVoiceCallSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setSmSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setSpSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setVsDuringCSSupported(Z)V
-Lcom/android/ims/internal/uce/common/CapInfo;->setVsSupported(Z)V
-Lcom/android/ims/internal/uce/common/StatusCode;-><init>()V
-Lcom/android/ims/internal/uce/common/StatusCode;->getStatusCode()I
-Lcom/android/ims/internal/uce/common/StatusCode;->setStatusCode(I)V
-Lcom/android/ims/internal/uce/common/UceLong;-><init>()V
-Lcom/android/ims/internal/uce/common/UceLong;->getClientId()I
-Lcom/android/ims/internal/uce/common/UceLong;->getUceLong()J
-Lcom/android/ims/internal/uce/common/UceLong;->setClientId(I)V
-Lcom/android/ims/internal/uce/common/UceLong;->setUceLong(J)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->cmdStatus(Lcom/android/ims/internal/uce/options/OptionsCmdStatus;)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->getVersionCb(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->incomingOptions(Ljava/lang/String;Lcom/android/ims/internal/uce/options/OptionsCapInfo;I)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->serviceAvailable(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->serviceUnavailable(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->sipResponseReceived(Ljava/lang/String;Lcom/android/ims/internal/uce/options/OptionsSipResponse;Lcom/android/ims/internal/uce/options/OptionsCapInfo;)V
-Lcom/android/ims/internal/uce/options/IOptionsService$Stub;-><init>()V
-Lcom/android/ims/internal/uce/options/IOptionsService;->addListener(ILcom/android/ims/internal/uce/options/IOptionsListener;Lcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->getContactCap(ILjava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->getContactListCap(I[Ljava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->getMyInfo(II)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->getVersion(I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->removeListener(ILcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->responseIncomingOptions(IIILjava/lang/String;Lcom/android/ims/internal/uce/options/OptionsCapInfo;Z)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->setMyInfo(ILcom/android/ims/internal/uce/common/CapInfo;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/OptionsCapInfo;-><init>()V
-Lcom/android/ims/internal/uce/options/OptionsCapInfo;->getCapInfo()Lcom/android/ims/internal/uce/common/CapInfo;
-Lcom/android/ims/internal/uce/options/OptionsCapInfo;->getSdp()Ljava/lang/String;
-Lcom/android/ims/internal/uce/options/OptionsCapInfo;->setCapInfo(Lcom/android/ims/internal/uce/common/CapInfo;)V
-Lcom/android/ims/internal/uce/options/OptionsCapInfo;->setSdp(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/options/OptionsCmdId;-><init>()V
-Lcom/android/ims/internal/uce/options/OptionsCmdId;->setCmdId(I)V
-Lcom/android/ims/internal/uce/options/OptionsCmdStatus;-><init>()V
-Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setCapInfo(Lcom/android/ims/internal/uce/common/CapInfo;)V
-Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setCmdId(Lcom/android/ims/internal/uce/options/OptionsCmdId;)V
-Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setStatus(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setUserData(I)V
-Lcom/android/ims/internal/uce/options/OptionsSipResponse;-><init>()V
-Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setCmdId(Lcom/android/ims/internal/uce/options/OptionsCmdId;)V
-Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setReasonPhrase(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setRequestId(I)V
-Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setRetryAfter(I)V
-Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setSipResponseCode(I)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->capInfoReceived(Ljava/lang/String;[Lcom/android/ims/internal/uce/presence/PresTupleInfo;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->cmdStatus(Lcom/android/ims/internal/uce/presence/PresCmdStatus;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->getVersionCb(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->listCapInfoReceived(Lcom/android/ims/internal/uce/presence/PresRlmiInfo;[Lcom/android/ims/internal/uce/presence/PresResInfo;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->publishTriggering(Lcom/android/ims/internal/uce/presence/PresPublishTriggerType;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->serviceAvailable(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->serviceUnAvailable(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->sipResponseReceived(Lcom/android/ims/internal/uce/presence/PresSipResponse;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->unpublishMessageSent()V
-Lcom/android/ims/internal/uce/presence/IPresenceService$Stub;-><init>()V
-Lcom/android/ims/internal/uce/presence/IPresenceService;->addListener(ILcom/android/ims/internal/uce/presence/IPresenceListener;Lcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->getContactCap(ILjava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->getContactListCap(I[Ljava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->getVersion(I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->publishMyCap(ILcom/android/ims/internal/uce/presence/PresCapInfo;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->reenableService(II)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->removeListener(ILcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->setNewFeatureTag(ILjava/lang/String;Lcom/android/ims/internal/uce/presence/PresServiceInfo;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/PresCapInfo;->getCapInfo()Lcom/android/ims/internal/uce/common/CapInfo;
-Lcom/android/ims/internal/uce/presence/PresCapInfo;->getContactUri()Ljava/lang/String;
-Lcom/android/ims/internal/uce/presence/PresCapInfo;->mContactUri:Ljava/lang/String;
-Lcom/android/ims/internal/uce/presence/PresCmdId;-><init>()V
-Lcom/android/ims/internal/uce/presence/PresCmdId;->setCmdId(I)V
-Lcom/android/ims/internal/uce/presence/PresCmdStatus;-><init>()V
-Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setCmdId(Lcom/android/ims/internal/uce/presence/PresCmdId;)V
-Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setRequestId(I)V
-Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setStatus(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setUserData(I)V
-Lcom/android/ims/internal/uce/presence/PresPublishTriggerType;-><init>()V
-Lcom/android/ims/internal/uce/presence/PresPublishTriggerType;->setPublishTrigeerType(I)V
-Lcom/android/ims/internal/uce/presence/PresResInfo;-><init>()V
-Lcom/android/ims/internal/uce/presence/PresResInfo;->setDisplayName(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresResInfo;->setInstanceInfo(Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;)V
-Lcom/android/ims/internal/uce/presence/PresResInfo;->setResUri(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;-><init>()V
-Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setPresentityUri(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setReason(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setResId(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setResInstanceState(I)V
-Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setTupleInfo([Lcom/android/ims/internal/uce/presence/PresTupleInfo;)V
-Lcom/android/ims/internal/uce/presence/PresRlmiInfo;-><init>()V
-Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setFullState(Z)V
-Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setListName(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setPresSubscriptionState(Lcom/android/ims/internal/uce/presence/PresSubscriptionState;)V
-Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setRequestId(I)V
-Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setSubscriptionExpireTime(I)V
-Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setSubscriptionTerminatedReason(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setUri(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setVersion(I)V
-Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getMediaType()I
-Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getServiceDesc()Ljava/lang/String;
-Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getServiceId()Ljava/lang/String;
-Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getServiceVer()Ljava/lang/String;
-Lcom/android/ims/internal/uce/presence/PresSipResponse;-><init>()V
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->getCmdId()Lcom/android/ims/internal/uce/presence/PresCmdId;
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->getReasonPhrase()Ljava/lang/String;
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->getRequestId()I
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->getRetryAfter()I
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->getSipResponseCode()I
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->setCmdId(Lcom/android/ims/internal/uce/presence/PresCmdId;)V
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->setReasonPhrase(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->setRequestId(I)V
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->setRetryAfter(I)V
-Lcom/android/ims/internal/uce/presence/PresSipResponse;->setSipResponseCode(I)V
-Lcom/android/ims/internal/uce/presence/PresSubscriptionState;-><init>()V
-Lcom/android/ims/internal/uce/presence/PresSubscriptionState;->setPresSubscriptionState(I)V
-Lcom/android/ims/internal/uce/presence/PresTupleInfo;-><init>()V
-Lcom/android/ims/internal/uce/presence/PresTupleInfo;->setContactUri(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresTupleInfo;->setFeatureTag(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/PresTupleInfo;->setTimestamp(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/uceservice/IUceListener$Stub;-><init>()V
-Lcom/android/ims/internal/uce/uceservice/IUceListener;->setStatus(I)V
-Lcom/android/ims/internal/uce/uceservice/IUceService$Stub;-><init>()V
-Lcom/android/ims/internal/uce/uceservice/IUceService;->createOptionsService(Lcom/android/ims/internal/uce/options/IOptionsListener;Lcom/android/ims/internal/uce/common/UceLong;)I
-Lcom/android/ims/internal/uce/uceservice/IUceService;->createPresenceService(Lcom/android/ims/internal/uce/presence/IPresenceListener;Lcom/android/ims/internal/uce/common/UceLong;)I
-Lcom/android/ims/internal/uce/uceservice/IUceService;->destroyOptionsService(I)V
-Lcom/android/ims/internal/uce/uceservice/IUceService;->destroyPresenceService(I)V
-Lcom/android/ims/internal/uce/uceservice/IUceService;->getOptionsService()Lcom/android/ims/internal/uce/options/IOptionsService;
-Lcom/android/ims/internal/uce/uceservice/IUceService;->getPresenceService()Lcom/android/ims/internal/uce/presence/IPresenceService;
-Lcom/android/ims/internal/uce/uceservice/IUceService;->getServiceStatus()Z
-Lcom/android/ims/internal/uce/uceservice/IUceService;->isServiceStarted()Z
-Lcom/android/ims/internal/uce/uceservice/IUceService;->startService(Lcom/android/ims/internal/uce/uceservice/IUceListener;)Z
-Lcom/android/ims/internal/uce/uceservice/IUceService;->stopService()Z
-Lcom/android/internal/R$array;->config_mobile_hotspot_provision_app:I
-Lcom/android/internal/R$array;->config_tether_wifi_regexs:I
-Lcom/android/internal/R$array;->maps_starting_lat_lng:I
-Lcom/android/internal/R$array;->maps_starting_zoom:I
-Lcom/android/internal/R$attr;->actionBarStyle:I
-Lcom/android/internal/R$attr;->mapViewStyle:I
-Lcom/android/internal/R$attr;->state_focused:I
-Lcom/android/internal/R$attr;->state_pressed:I
-Lcom/android/internal/R$attr;->state_selected:I
-Lcom/android/internal/R$attr;->switchStyle:I
-Lcom/android/internal/R$bool;->config_mms_content_disposition_support:I
-Lcom/android/internal/R$bool;->config_showNavigationBar:I
-Lcom/android/internal/R$dimen;-><init>()V
-Lcom/android/internal/R$dimen;->navigation_bar_height:I
-Lcom/android/internal/R$dimen;->navigation_bar_height_landscape:I
-Lcom/android/internal/R$dimen;->status_bar_height:I
-Lcom/android/internal/R$dimen;->toast_y_offset:I
-Lcom/android/internal/R$drawable;->btn_check_off:I
-Lcom/android/internal/R$drawable;->compass_arrow:I
-Lcom/android/internal/R$drawable;->compass_base:I
-Lcom/android/internal/R$drawable;->ic_maps_indicator_current_position_anim:I
-Lcom/android/internal/R$drawable;->ic_menu_close_clear_cancel:I
-Lcom/android/internal/R$drawable;->loading_tile_android:I
-Lcom/android/internal/R$drawable;->maps_google_logo:I
-Lcom/android/internal/R$drawable;->no_tile_256:I
-Lcom/android/internal/R$drawable;->reticle:I
-Lcom/android/internal/R$id;->amPm:I
-Lcom/android/internal/R$id;->edittext_container:I
-Lcom/android/internal/R$id;->icon:I
-Lcom/android/internal/R$id;->message:I
-Lcom/android/internal/R$id;->minute:I
-Lcom/android/internal/R$id;->shortcut:I
-Lcom/android/internal/R$id;->text:I
-Lcom/android/internal/R$id;->time:I
-Lcom/android/internal/R$id;->timePicker:I
-Lcom/android/internal/R$id;->title:I
-Lcom/android/internal/R$id;->title_container:I
-Lcom/android/internal/R$integer;->config_screenBrightnessDim:I
-Lcom/android/internal/R$integer;->config_toastDefaultGravity:I
-Lcom/android/internal/R$layout;->screen_title:I
-Lcom/android/internal/R$string;->byteShort:I
-Lcom/android/internal/R$string;->gigabyteShort:I
-Lcom/android/internal/R$string;->kilobyteShort:I
-Lcom/android/internal/R$string;->megabyteShort:I
-Lcom/android/internal/R$string;->petabyteShort:I
-Lcom/android/internal/R$string;->terabyteShort:I
-Lcom/android/internal/R$style;->Theme:I
-Lcom/android/internal/R$styleable;->AbsListView:[I
-Lcom/android/internal/R$styleable;->AbsListView_cacheColorHint:I
-Lcom/android/internal/R$styleable;->AbsListView_choiceMode:I
-Lcom/android/internal/R$styleable;->AbsListView_drawSelectorOnTop:I
-Lcom/android/internal/R$styleable;->AbsListView_fastScrollAlwaysVisible:I
-Lcom/android/internal/R$styleable;->AbsListView_fastScrollEnabled:I
-Lcom/android/internal/R$styleable;->AbsListView_listSelector:I
-Lcom/android/internal/R$styleable;->AbsListView_scrollingCache:I
-Lcom/android/internal/R$styleable;->AbsListView_smoothScrollbar:I
-Lcom/android/internal/R$styleable;->AbsListView_stackFromBottom:I
-Lcom/android/internal/R$styleable;->AbsListView_textFilterEnabled:I
-Lcom/android/internal/R$styleable;->AbsListView_transcriptMode:I
-Lcom/android/internal/R$styleable;->AccountAuthenticator:[I
-Lcom/android/internal/R$styleable;->AccountAuthenticator_accountPreferences:I
-Lcom/android/internal/R$styleable;->AccountAuthenticator_accountType:I
-Lcom/android/internal/R$styleable;->AccountAuthenticator_customTokens:I
-Lcom/android/internal/R$styleable;->AccountAuthenticator_icon:I
-Lcom/android/internal/R$styleable;->AccountAuthenticator_label:I
-Lcom/android/internal/R$styleable;->AccountAuthenticator_smallIcon:I
-Lcom/android/internal/R$styleable;->AndroidManifest:[I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity:[I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_allowTaskReparenting:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_configChanges:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_description:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_enabled:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_excludeFromRecents:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_exported:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_hardwareAccelerated:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_icon:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_immersive:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_label:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_launchMode:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_logo:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_name:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_noHistory:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_permission:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_process:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_screenOrientation:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_taskAffinity:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_theme:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_uiOptions:I
-Lcom/android/internal/R$styleable;->AndroidManifestActivity_windowSoftInputMode:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication:[I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_enabled:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_hardwareAccelerated:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_label:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_largeHeap:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_name:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_permission:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_process:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_supportsRtl:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_theme:I
-Lcom/android/internal/R$styleable;->AndroidManifestApplication_uiOptions:I
-Lcom/android/internal/R$styleable;->AndroidManifestData:[I
-Lcom/android/internal/R$styleable;->AndroidManifestIntentFilter:[I
-Lcom/android/internal/R$styleable;->AndroidManifestIntentFilter_priority:I
-Lcom/android/internal/R$styleable;->AndroidManifestMetaData:[I
-Lcom/android/internal/R$styleable;->AndroidManifestMetaData_name:I
-Lcom/android/internal/R$styleable;->AndroidManifestMetaData_resource:I
-Lcom/android/internal/R$styleable;->AndroidManifestMetaData_value:I
-Lcom/android/internal/R$styleable;->AndroidManifestService:[I
-Lcom/android/internal/R$styleable;->AndroidManifestService_enabled:I
-Lcom/android/internal/R$styleable;->AndroidManifestService_exported:I
-Lcom/android/internal/R$styleable;->AndroidManifestService_name:I
-Lcom/android/internal/R$styleable;->AndroidManifestService_permission:I
-Lcom/android/internal/R$styleable;->AndroidManifestService_process:I
-Lcom/android/internal/R$styleable;->AndroidManifestUsesPermission:[I
-Lcom/android/internal/R$styleable;->AndroidManifestUsesPermission_name:I
-Lcom/android/internal/R$styleable;->AndroidManifestUsesSdk:[I
-Lcom/android/internal/R$styleable;->AndroidManifestUsesSdk_minSdkVersion:I
-Lcom/android/internal/R$styleable;->AndroidManifestUsesSdk_targetSdkVersion:I
-Lcom/android/internal/R$styleable;->AndroidManifest_installLocation:I
-Lcom/android/internal/R$styleable;->AndroidManifest_sharedUserId:I
-Lcom/android/internal/R$styleable;->AndroidManifest_versionCode:I
-Lcom/android/internal/R$styleable;->AndroidManifest_versionName:I
-Lcom/android/internal/R$styleable;->CheckBoxPreference:[I
-Lcom/android/internal/R$styleable;->CheckBoxPreference_disableDependentsState:I
-Lcom/android/internal/R$styleable;->CheckBoxPreference_summaryOff:I
-Lcom/android/internal/R$styleable;->CheckBoxPreference_summaryOn:I
-Lcom/android/internal/R$styleable;->CompoundButton:[I
-Lcom/android/internal/R$styleable;->CompoundButton_button:I
-Lcom/android/internal/R$styleable;->CompoundButton_checked:I
-Lcom/android/internal/R$styleable;->DialogPreference:[I
-Lcom/android/internal/R$styleable;->DialogPreference_dialogTitle:I
-Lcom/android/internal/R$styleable;->EdgeEffect:[I
-Lcom/android/internal/R$styleable;->EdgeEffect_colorEdgeEffect:I
-Lcom/android/internal/R$styleable;->GridView:[I
-Lcom/android/internal/R$styleable;->IconMenuView:[I
-Lcom/android/internal/R$styleable;->ImageView:[I
-Lcom/android/internal/R$styleable;->ImageView_scaleType:I
-Lcom/android/internal/R$styleable;->ImageView_src:I
-Lcom/android/internal/R$styleable;->ListPreference:[I
-Lcom/android/internal/R$styleable;->ListPreference_entries:I
-Lcom/android/internal/R$styleable;->ListView:[I
-Lcom/android/internal/R$styleable;->ListView_divider:I
-Lcom/android/internal/R$styleable;->ListView_dividerHeight:I
-Lcom/android/internal/R$styleable;->ListView_entries:I
-Lcom/android/internal/R$styleable;->ListView_footerDividersEnabled:I
-Lcom/android/internal/R$styleable;->ListView_headerDividersEnabled:I
-Lcom/android/internal/R$styleable;->ListView_overScrollFooter:I
-Lcom/android/internal/R$styleable;->ListView_overScrollHeader:I
-Lcom/android/internal/R$styleable;->NumberPicker:[I
-Lcom/android/internal/R$styleable;->PopupWindow:[I
-Lcom/android/internal/R$styleable;->Preference:[I
-Lcom/android/internal/R$styleable;->PreferenceGroup:[I
-Lcom/android/internal/R$styleable;->PreferenceGroup_orderingFromXml:I
-Lcom/android/internal/R$styleable;->Preference_defaultValue:I
-Lcom/android/internal/R$styleable;->Preference_dependency:I
-Lcom/android/internal/R$styleable;->Preference_enabled:I
-Lcom/android/internal/R$styleable;->Preference_fragment:I
-Lcom/android/internal/R$styleable;->Preference_icon:I
-Lcom/android/internal/R$styleable;->Preference_key:I
-Lcom/android/internal/R$styleable;->Preference_layout:I
-Lcom/android/internal/R$styleable;->Preference_order:I
-Lcom/android/internal/R$styleable;->Preference_persistent:I
-Lcom/android/internal/R$styleable;->Preference_selectable:I
-Lcom/android/internal/R$styleable;->Preference_shouldDisableView:I
-Lcom/android/internal/R$styleable;->Preference_summary:I
-Lcom/android/internal/R$styleable;->Preference_title:I
-Lcom/android/internal/R$styleable;->Preference_widgetLayout:I
-Lcom/android/internal/R$styleable;->ScrollView:[I
-Lcom/android/internal/R$styleable;->ScrollView_fillViewport:I
-Lcom/android/internal/R$styleable;->SyncAdapter:[I
-Lcom/android/internal/R$styleable;->SyncAdapter_accountType:I
-Lcom/android/internal/R$styleable;->SyncAdapter_allowParallelSyncs:I
-Lcom/android/internal/R$styleable;->SyncAdapter_contentAuthority:I
-Lcom/android/internal/R$styleable;->SyncAdapter_isAlwaysSyncable:I
-Lcom/android/internal/R$styleable;->SyncAdapter_settingsActivity:I
-Lcom/android/internal/R$styleable;->SyncAdapter_supportsUploading:I
-Lcom/android/internal/R$styleable;->SyncAdapter_userVisible:I
-Lcom/android/internal/R$styleable;->TabWidget:[I
-Lcom/android/internal/R$styleable;->TextAppearance:[I
-Lcom/android/internal/R$styleable;->TextView:[I
-Lcom/android/internal/R$styleable;->TextViewAppearance:[I
-Lcom/android/internal/R$styleable;->TextView_drawableBottom:I
-Lcom/android/internal/R$styleable;->TextView_drawableLeft:I
-Lcom/android/internal/R$styleable;->TextView_drawableRight:I
-Lcom/android/internal/R$styleable;->TextView_drawableTop:I
-Lcom/android/internal/R$styleable;->TextView_maxLines:I
-Lcom/android/internal/R$styleable;->TextView_textColor:I
-Lcom/android/internal/R$styleable;->TextView_textColorHint:I
-Lcom/android/internal/R$styleable;->TwoLineListItem:[I
-Lcom/android/internal/R$styleable;->View:[I
-Lcom/android/internal/R$styleable;->ViewGroup_Layout:[I
-Lcom/android/internal/R$styleable;->ViewGroup_Layout_layout_height:I
-Lcom/android/internal/R$styleable;->ViewGroup_Layout_layout_width:I
-Lcom/android/internal/R$styleable;->ViewStub:[I
-Lcom/android/internal/R$styleable;->ViewStub_inflatedId:I
-Lcom/android/internal/R$styleable;->ViewStub_layout:I
-Lcom/android/internal/R$styleable;->View_background:I
-Lcom/android/internal/R$styleable;->View_id:I
-Lcom/android/internal/R$styleable;->Window:[I
-Lcom/android/internal/R$styleable;->Window_windowActionBarFullscreenDecorLayout:I
-Lcom/android/internal/R$styleable;->Window_windowIsFloating:I
-Lcom/android/internal/R$styleable;->Window_windowIsTranslucent:I
-Lcom/android/internal/R$styleable;->Window_windowShowWallpaper:I
-Lcom/android/internal/R$xml;->power_profile:I
-Lcom/android/internal/app/AlertController$AlertParams;->mIconId:I
-Lcom/android/internal/app/AlertController$AlertParams;->mMessage:Ljava/lang/CharSequence;
-Lcom/android/internal/app/AlertController$AlertParams;->mNegativeButtonListener:Landroid/content/DialogInterface$OnClickListener;
-Lcom/android/internal/app/AlertController$AlertParams;->mNegativeButtonText:Ljava/lang/CharSequence;
-Lcom/android/internal/app/AlertController$AlertParams;->mPositiveButtonListener:Landroid/content/DialogInterface$OnClickListener;
-Lcom/android/internal/app/AlertController$AlertParams;->mPositiveButtonText:Ljava/lang/CharSequence;
-Lcom/android/internal/app/AlertController$AlertParams;->mTitle:Ljava/lang/CharSequence;
-Lcom/android/internal/app/AlertController$AlertParams;->mView:Landroid/view/View;
-Lcom/android/internal/app/AlertController$RecycleListView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-Lcom/android/internal/app/AlertController;->getButton(I)Landroid/widget/Button;
-Lcom/android/internal/app/AlertController;->mCustomTitleView:Landroid/view/View;
-Lcom/android/internal/app/AlertController;->mForceInverseBackground:Z
-Lcom/android/internal/app/AlertController;->mTitle:Ljava/lang/CharSequence;
-Lcom/android/internal/app/AlertController;->mView:Landroid/view/View;
-Lcom/android/internal/app/IAppOpsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/app/IAppOpsService$Stub$Proxy;->checkOperation(IILjava/lang/String;)I
-Lcom/android/internal/app/IAppOpsService$Stub$Proxy;->setMode(IILjava/lang/String;I)V
-Lcom/android/internal/app/IAppOpsService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IAppOpsService;
-Lcom/android/internal/app/IAppOpsService;->finishOperation(Landroid/os/IBinder;IILjava/lang/String;)V
-Lcom/android/internal/app/IBatteryStats$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/app/IBatteryStats$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IBatteryStats;
-Lcom/android/internal/app/IBatteryStats;->getStatistics()[B
-Lcom/android/internal/app/IVoiceInteractionManagerService$Stub$Proxy;->showSessionFromSession(Landroid/os/IBinder;Landroid/os/Bundle;I)Z
-Lcom/android/internal/app/IVoiceInteractionManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IVoiceInteractionManagerService;
-Lcom/android/internal/app/IVoiceInteractionManagerService;->getKeyphraseSoundModel(ILjava/lang/String;)Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseSoundModel;
-Lcom/android/internal/appwidget/IAppWidgetService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/appwidget/IAppWidgetService;
-Lcom/android/internal/content/PackageMonitor;-><init>()V
-Lcom/android/internal/content/PackageMonitor;->register(Landroid/content/Context;Landroid/os/Looper;Landroid/os/UserHandle;Z)V
-Lcom/android/internal/content/PackageMonitor;->unregister()V
-Lcom/android/internal/content/ReferrerIntent;-><init>(Landroid/content/Intent;Ljava/lang/String;)V
-Lcom/android/internal/content/ReferrerIntent;->mReferrer:Ljava/lang/String;
-Lcom/android/internal/location/ILocationProvider$Stub;-><init>()V
-Lcom/android/internal/location/ILocationProvider$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/location/ILocationProvider;
-Lcom/android/internal/location/ILocationProvider;->disable()V
-Lcom/android/internal/location/ILocationProvider;->enable()V
-Lcom/android/internal/location/ILocationProvider;->getProperties()Lcom/android/internal/location/ProviderProperties;
-Lcom/android/internal/location/ILocationProvider;->getStatus(Landroid/os/Bundle;)I
-Lcom/android/internal/location/ILocationProvider;->getStatusUpdateTime()J
-Lcom/android/internal/location/ILocationProvider;->sendExtraCommand(Ljava/lang/String;Landroid/os/Bundle;)Z
-Lcom/android/internal/location/ILocationProvider;->setRequest(Lcom/android/internal/location/ProviderRequest;Landroid/os/WorkSource;)V
-Lcom/android/internal/location/ProviderRequest;-><init>()V
-Lcom/android/internal/location/ProviderRequest;->interval:J
-Lcom/android/internal/location/ProviderRequest;->locationRequests:Ljava/util/List;
-Lcom/android/internal/location/ProviderRequest;->reportLocation:Z
-Lcom/android/internal/os/BatterySipper;-><init>(Lcom/android/internal/os/BatterySipper$DrainType;Landroid/os/BatteryStats$Uid;D)V
-Lcom/android/internal/os/BatterySipper;->add(Lcom/android/internal/os/BatterySipper;)V
-Lcom/android/internal/os/BatterySipper;->drainType:Lcom/android/internal/os/BatterySipper$DrainType;
-Lcom/android/internal/os/BatterySipper;->getUid()I
-Lcom/android/internal/os/BatterySipper;->mPackages:[Ljava/lang/String;
-Lcom/android/internal/os/BatterySipper;->packageWithHighestDrain:Ljava/lang/String;
-Lcom/android/internal/os/BatterySipper;->totalPowerMah:D
-Lcom/android/internal/os/BatterySipper;->uidObj:Landroid/os/BatteryStats$Uid;
-Lcom/android/internal/os/BatteryStatsHelper;-><init>(Landroid/content/Context;ZZ)V
-Lcom/android/internal/os/BatteryStatsHelper;->getMaxPower()D
-Lcom/android/internal/os/BatteryStatsHelper;->getStats()Landroid/os/BatteryStats;
-Lcom/android/internal/os/BatteryStatsHelper;->getTotalPower()D
-Lcom/android/internal/os/BatteryStatsHelper;->load()V
-Lcom/android/internal/os/BatteryStatsHelper;->mBatteryInfo:Lcom/android/internal/app/IBatteryStats;
-Lcom/android/internal/os/BatteryStatsHelper;->mPowerProfile:Lcom/android/internal/os/PowerProfile;
-Lcom/android/internal/os/BatteryStatsHelper;->mUsageList:Ljava/util/List;
-Lcom/android/internal/os/BatteryStatsHelper;->refreshStats(II)V
-Lcom/android/internal/os/BatteryStatsImpl$Timer;->getCountLocked(I)I
-Lcom/android/internal/os/BatteryStatsImpl$Timer;->getTotalTimeLocked(JI)J
-Lcom/android/internal/os/BatteryStatsImpl$Uid$Proc;->getForegroundTime(I)J
-Lcom/android/internal/os/BatteryStatsImpl$Uid$Proc;->getStarts(I)I
-Lcom/android/internal/os/BatteryStatsImpl$Uid$Proc;->getSystemTime(I)J
-Lcom/android/internal/os/BatteryStatsImpl$Uid$Proc;->getUserTime(I)J
-Lcom/android/internal/os/BatteryStatsImpl$Uid$Sensor;->getHandle()I
-Lcom/android/internal/os/BatteryStatsImpl$Uid$Sensor;->getSensorTime()Lcom/android/internal/os/BatteryStatsImpl$Timer;
-Lcom/android/internal/os/BatteryStatsImpl$Uid$Wakelock;->getWakeTime(I)Lcom/android/internal/os/BatteryStatsImpl$Timer;
-Lcom/android/internal/os/BatteryStatsImpl$Uid;->getProcessStats()Landroid/util/ArrayMap;
-Lcom/android/internal/os/BatteryStatsImpl$Uid;->getSensorStats()Landroid/util/SparseArray;
-Lcom/android/internal/os/BatteryStatsImpl$Uid;->getUid()I
-Lcom/android/internal/os/BatteryStatsImpl$Uid;->getWakelockStats()Landroid/util/ArrayMap;
-Lcom/android/internal/os/BatteryStatsImpl$Uid;->getWifiRunningTime(JI)J
-Lcom/android/internal/os/BatteryStatsImpl$Uid;->getWifiScanTime(JI)J
-Lcom/android/internal/os/BatteryStatsImpl;->CREATOR:Landroid/os/Parcelable$Creator;
-Lcom/android/internal/os/BatteryStatsImpl;->computeBatteryRealtime(JI)J
-Lcom/android/internal/os/BatteryStatsImpl;->computeBatteryUptime(JI)J
-Lcom/android/internal/os/BatteryStatsImpl;->getBatteryRealtime(J)J
-Lcom/android/internal/os/BatteryStatsImpl;->getDischargeAmount(I)I
-Lcom/android/internal/os/BatteryStatsImpl;->getDischargeCurrentLevel()I
-Lcom/android/internal/os/BatteryStatsImpl;->getDischargeStartLevel()I
-Lcom/android/internal/os/BatteryStatsImpl;->getGlobalWifiRunningTime(JI)J
-Lcom/android/internal/os/BatteryStatsImpl;->getPhoneOnTime(JI)J
-Lcom/android/internal/os/BatteryStatsImpl;->getPhoneSignalScanningTime(JI)J
-Lcom/android/internal/os/BatteryStatsImpl;->getPhoneSignalStrengthTime(IJI)J
-Lcom/android/internal/os/BatteryStatsImpl;->getScreenBrightnessTime(IJI)J
-Lcom/android/internal/os/BatteryStatsImpl;->getScreenOnTime(JI)J
-Lcom/android/internal/os/BatteryStatsImpl;->getUidStats()Landroid/util/SparseArray;
-Lcom/android/internal/os/BatteryStatsImpl;->getUidStatsLocked(I)Lcom/android/internal/os/BatteryStatsImpl$Uid;
-Lcom/android/internal/os/BatteryStatsImpl;->getWifiOnTime(JI)J
-Lcom/android/internal/os/FuseAppLoop;->onCommand(IJJJI[B)V
-Lcom/android/internal/os/FuseAppLoop;->onOpen(JJ)[B
-Lcom/android/internal/os/IDropBoxManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/os/IDropBoxManagerService;
-Lcom/android/internal/os/PowerProfile;-><init>(Landroid/content/Context;)V
-Lcom/android/internal/os/PowerProfile;->getAveragePower(Ljava/lang/String;)D
-Lcom/android/internal/os/PowerProfile;->getAveragePower(Ljava/lang/String;I)D
-Lcom/android/internal/os/PowerProfile;->getBatteryCapacity()D
-Lcom/android/internal/os/SomeArgs;->arg1:Ljava/lang/Object;
-Lcom/android/internal/os/SomeArgs;->arg2:Ljava/lang/Object;
-Lcom/android/internal/os/SomeArgs;->arg3:Ljava/lang/Object;
-Lcom/android/internal/os/SomeArgs;->obtain()Lcom/android/internal/os/SomeArgs;
-Lcom/android/internal/os/SomeArgs;->recycle()V
-Lcom/android/internal/telephony/GsmAlphabet;->gsm7BitPackedToString([BII)Ljava/lang/String;
-Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm7BitPacked(Ljava/lang/String;)[B
-Lcom/android/internal/telephony/IMms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IMms;
-Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneSubInfo;
-Lcom/android/internal/telephony/ISms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ISms;
-Lcom/android/internal/telephony/ISub$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/telephony/ITelephony$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->endCall()Z
-Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_call:I
-Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_endCall:I
-Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_getDeviceId:I
-Lcom/android/internal/telephony/ITelephony$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephony;
-Lcom/android/internal/telephony/ITelephony;->answerRingingCall()V
-Lcom/android/internal/telephony/ITelephony;->call(Ljava/lang/String;Ljava/lang/String;)V
-Lcom/android/internal/telephony/ITelephony;->dial(Ljava/lang/String;)V
-Lcom/android/internal/telephony/ITelephony;->disableDataConnectivity()Z
-Lcom/android/internal/telephony/ITelephony;->enableDataConnectivity()Z
-Lcom/android/internal/telephony/ITelephony;->endCall()Z
-Lcom/android/internal/telephony/ITelephony;->endCallForSubscriber(I)Z
-Lcom/android/internal/telephony/ITelephony;->getCallState()I
-Lcom/android/internal/telephony/ITelephony;->getDataEnabled(I)Z
-Lcom/android/internal/telephony/ITelephony;->getDataState()I
-Lcom/android/internal/telephony/ITelephony;->isIdle(Ljava/lang/String;)Z
-Lcom/android/internal/telephony/ITelephony;->setRadio(Z)Z
-Lcom/android/internal/telephony/ITelephony;->silenceRinger()V
-Lcom/android/internal/telephony/ITelephonyRegistry$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/telephony/ITelephonyRegistry$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephonyRegistry;
-Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallState(ILjava/lang/String;)V
-Lcom/android/internal/telephony/OperatorInfo$State;->CURRENT:Lcom/android/internal/telephony/OperatorInfo$State;
-Lcom/android/internal/telephony/OperatorInfo$State;->FORBIDDEN:Lcom/android/internal/telephony/OperatorInfo$State;
-Lcom/android/internal/telephony/OperatorInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-Lcom/android/internal/telephony/OperatorInfo;->CREATOR:Landroid/os/Parcelable$Creator;
-Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaLong()Ljava/lang/String;
-Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaShort()Ljava/lang/String;
-Lcom/android/internal/telephony/OperatorInfo;->getOperatorNumeric()Ljava/lang/String;
-Lcom/android/internal/telephony/OperatorInfo;->getState()Lcom/android/internal/telephony/OperatorInfo$State;
-Lcom/android/internal/telephony/SmsHeader$ConcatRef;->msgCount:I
-Lcom/android/internal/telephony/SmsHeader$ConcatRef;->refNumber:I
-Lcom/android/internal/telephony/SmsHeader$ConcatRef;->seqNumber:I
-Lcom/android/internal/telephony/SmsHeader;->concatRef:Lcom/android/internal/telephony/SmsHeader$ConcatRef;
-Lcom/android/internal/telephony/SmsMessageBase;->mUserDataHeader:Lcom/android/internal/telephony/SmsHeader;
-Lcom/android/internal/telephony/SmsRawData;-><init>([B)V
-Lcom/android/internal/telephony/SmsRawData;->CREATOR:Landroid/os/Parcelable$Creator;
-Lcom/android/internal/textservice/ITextServicesManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/util/AsyncChannel;-><init>()V
-Lcom/android/internal/util/AsyncChannel;->connect(Landroid/content/Context;Landroid/os/Handler;Landroid/os/Messenger;)V
-Lcom/android/internal/util/AsyncChannel;->sendMessage(III)V
-Lcom/android/internal/util/AsyncChannel;->sendMessage(Landroid/os/Message;)V
-Lcom/android/internal/util/FastPrintWriter;-><init>(Ljava/io/OutputStream;)V
-Lcom/android/internal/util/IndentingPrintWriter;-><init>(Ljava/io/Writer;Ljava/lang/String;)V
-Lcom/android/internal/util/IndentingPrintWriter;->decreaseIndent()Lcom/android/internal/util/IndentingPrintWriter;
-Lcom/android/internal/util/IndentingPrintWriter;->increaseIndent()Lcom/android/internal/util/IndentingPrintWriter;
-Lcom/android/internal/util/XmlUtils;->beginDocument(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)V
-Lcom/android/internal/util/XmlUtils;->nextElement(Lorg/xmlpull/v1/XmlPullParser;)V
-Lcom/android/internal/util/XmlUtils;->readMapXml(Ljava/io/InputStream;)Ljava/util/HashMap;
-Lcom/android/internal/util/XmlUtils;->skipCurrentTag(Lorg/xmlpull/v1/XmlPullParser;)V
-Lcom/android/internal/util/XmlUtils;->writeMapXml(Ljava/util/Map;Ljava/io/OutputStream;)V
-Lcom/android/internal/view/IInputConnectionWrapper;->mInputConnection:Landroid/view/inputmethod/InputConnection;
-Lcom/android/internal/view/IInputConnectionWrapper;->mLock:Ljava/lang/Object;
-Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;->getEnabledInputMethodList()Ljava/util/List;
-Lcom/android/internal/view/IInputMethodManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodManager;
-Lcom/android/internal/view/InputBindResult;->CREATOR:Landroid/os/Parcelable$Creator;
-Lcom/android/internal/view/menu/MenuBuilder;-><init>(Landroid/content/Context;)V
-Lcom/android/internal/view/menu/MenuBuilder;->mContext:Landroid/content/Context;
-Lcom/android/internal/view/menu/MenuBuilder;->setCurrentMenuInfo(Landroid/view/ContextMenu$ContextMenuInfo;)V
-Lcom/android/internal/view/menu/MenuBuilder;->setOptionalIconsVisible(Z)V
-Lcom/android/internal/view/menu/MenuItemImpl;->mIconResId:I
-Lcom/android/internal/view/menu/MenuItemImpl;->setMenuInfo(Landroid/view/ContextMenu$ContextMenuInfo;)V
-Lcom/android/internal/view/menu/MenuPopupHelper;->mForceShowIcon:Z
-Lcom/android/internal/view/menu/MenuPopupHelper;->setForceShowIcon(Z)V
-Lcom/android/internal/view/menu/MenuView$ItemView;->getItemData()Lcom/android/internal/view/menu/MenuItemImpl;
-Lcom/android/okhttp/ConnectionPool;->keepAliveDurationNs:J
-Lcom/android/okhttp/ConnectionPool;->maxIdleConnections:I
-Lcom/android/okhttp/ConnectionPool;->systemDefault:Lcom/android/okhttp/ConnectionPool;
-Lcom/android/okhttp/HttpUrl;->encodedPath()Ljava/lang/String;
-Lcom/android/okhttp/HttpUrl;->query()Ljava/lang/String;
-Lcom/android/okhttp/OkHttpClient;->DEFAULT_PROTOCOLS:Ljava/util/List;
-Lcom/android/okhttp/OkHttpClient;->connectionPool:Lcom/android/okhttp/ConnectionPool;
-Lcom/android/okhttp/OkHttpClient;->dns:Lcom/android/okhttp/Dns;
-Lcom/android/okhttp/OkHttpClient;->setProtocols(Ljava/util/List;)Lcom/android/okhttp/OkHttpClient;
-Lcom/android/okhttp/OkHttpClient;->setRetryOnConnectionFailure(Z)V
-Lcom/android/okhttp/Request;->headers:Lcom/android/okhttp/Headers;
-Lcom/android/okhttp/Request;->method:Ljava/lang/String;
-Lcom/android/okhttp/Request;->url:Lcom/android/okhttp/HttpUrl;
-Lcom/android/okhttp/Response;->code:I
-Lcom/android/okhttp/Response;->headers:Lcom/android/okhttp/Headers;
-Lcom/android/okhttp/Response;->message:Ljava/lang/String;
-Lcom/android/okhttp/Response;->networkResponse:Lcom/android/okhttp/Response;
-Lcom/android/okhttp/Response;->protocol:Lcom/android/okhttp/Protocol;
-Lcom/android/okhttp/internal/http/HttpEngine;->httpStream:Lcom/android/okhttp/internal/http/HttpStream;
-Lcom/android/okhttp/internal/http/HttpEngine;->networkRequest(Lcom/android/okhttp/Request;)Lcom/android/okhttp/Request;
-Lcom/android/okhttp/internal/http/HttpEngine;->networkRequest:Lcom/android/okhttp/Request;
-Lcom/android/okhttp/internal/http/HttpEngine;->priorResponse:Lcom/android/okhttp/Response;
-Lcom/android/okhttp/internal/http/HttpEngine;->userResponse:Lcom/android/okhttp/Response;
-Lcom/android/okhttp/okio/ByteString;->readObject(Ljava/io/ObjectInputStream;)V
-Lcom/android/okhttp/okio/ByteString;->serialVersionUID:J
-Lcom/android/okhttp/okio/ByteString;->writeObject(Ljava/io/ObjectOutputStream;)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->getAlpnSelectedProtocol()[B
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->getApplicationProtocol()Ljava/lang/String;
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->getApplicationProtocols()[Ljava/lang/String;
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->getChannelId()[B
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHandshakeApplicationProtocol()Ljava/lang/String;
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHostname()Ljava/lang/String;
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHostnameOrIP()Ljava/lang/String;
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->getNpnSelectedProtocol()[B
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->getSoWriteTimeout()I
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setAlpnProtocols([B)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setAlpnProtocols([Ljava/lang/String;)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setApplicationProtocols([Ljava/lang/String;)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setChannelIdEnabled(Z)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setHandshakeTimeout(I)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setHostname(Ljava/lang/String;)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setNpnProtocols([B)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setSoWriteTimeout(I)V
-Lcom/android/org/conscrypt/AbstractConscryptSocket;->setUseSessionTickets(Z)V
-Lcom/android/org/conscrypt/ConscryptSocketBase;->getHostname()Ljava/lang/String;
-Lcom/android/org/conscrypt/ConscryptSocketBase;->getHostnameOrIP()Ljava/lang/String;
-Lcom/android/org/conscrypt/ConscryptSocketBase;->getSoWriteTimeout()I
-Lcom/android/org/conscrypt/ConscryptSocketBase;->setHandshakeTimeout(I)V
-Lcom/android/org/conscrypt/ConscryptSocketBase;->setHostname(Ljava/lang/String;)V
-Lcom/android/org/conscrypt/ConscryptSocketBase;->setSoWriteTimeout(I)V
-Lcom/android/org/conscrypt/ConscryptSocketBase;->socket:Ljava/net/Socket;
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getAlpnSelectedProtocol()[B
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getChannelId()[B
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostname()Ljava/lang/String;
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostnameOrIP()Ljava/lang/String;
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getNpnSelectedProtocol()[B
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getSoWriteTimeout()I
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([B)V
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([Ljava/lang/String;)V
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdEnabled(Z)V
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHandshakeTimeout(I)V
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHostname(Ljava/lang/String;)V
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setNpnProtocols([B)V
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setSoWriteTimeout(I)V
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setUseSessionTickets(Z)V
-Lcom/android/org/conscrypt/OpenSSLX509Certificate;->mContext:J
-Lcom/android/org/conscrypt/OpenSSLX509Certificate;->serialVersionUID:J
-Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$ParsingException;->serialVersionUID:J
-Lcom/android/org/conscrypt/TrustManagerImpl;-><init>(Ljava/security/KeyStore;)V
-Ldalvik/system/BaseDexClassLoader;->addDexPath(Ljava/lang/String;)V
-Ldalvik/system/BaseDexClassLoader;->getLdLibraryPath()Ljava/lang/String;
-Ldalvik/system/BaseDexClassLoader;->pathList:Ldalvik/system/DexPathList;
-Ldalvik/system/BlockGuard$Policy;->onNetwork()V
-Ldalvik/system/BlockGuard$Policy;->onReadFromDisk()V
-Ldalvik/system/BlockGuard;->getThreadPolicy()Ldalvik/system/BlockGuard$Policy;
-Ldalvik/system/CloseGuard;->close()V
-Ldalvik/system/CloseGuard;->get()Ldalvik/system/CloseGuard;
-Ldalvik/system/CloseGuard;->open(Ljava/lang/String;)V
-Ldalvik/system/CloseGuard;->warnIfOpen()V
-Ldalvik/system/DexFile$DFEnum;->mNameList:[Ljava/lang/String;
-Ldalvik/system/DexFile;->getClassNameList(Ljava/lang/Object;)[Ljava/lang/String;
-Ldalvik/system/DexFile;->isBackedByOatFile()Z
-Ldalvik/system/DexFile;->loadClassBinaryName(Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/List;)Ljava/lang/Class;
-Ldalvik/system/DexFile;->mCookie:Ljava/lang/Object;
-Ldalvik/system/DexFile;->mFileName:Ljava/lang/String;
-Ldalvik/system/DexFile;->mInternalCookie:Ljava/lang/Object;
-Ldalvik/system/DexFile;->openDexFile(Ljava/lang/String;Ljava/lang/String;ILjava/lang/ClassLoader;[Ldalvik/system/DexPathList$Element;)Ljava/lang/Object;
-Ldalvik/system/DexPathList$Element;-><init>(Ldalvik/system/DexFile;Ljava/io/File;)V
-Ldalvik/system/DexPathList$Element;-><init>(Ljava/io/File;ZLjava/io/File;Ldalvik/system/DexFile;)V
-Ldalvik/system/DexPathList$Element;->dexFile:Ldalvik/system/DexFile;
-Ldalvik/system/DexPathList$NativeLibraryElement;-><init>(Ljava/io/File;)V
-Ldalvik/system/DexPathList$NativeLibraryElement;->path:Ljava/io/File;
-Ldalvik/system/DexPathList;-><init>(Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)V
-Ldalvik/system/DexPathList;->addDexPath(Ljava/lang/String;Ljava/io/File;)V
-Ldalvik/system/DexPathList;->definingContext:Ljava/lang/ClassLoader;
-Ldalvik/system/DexPathList;->dexElements:[Ldalvik/system/DexPathList$Element;
-Ldalvik/system/DexPathList;->loadDexFile(Ljava/io/File;Ljava/io/File;Ljava/lang/ClassLoader;[Ldalvik/system/DexPathList$Element;)Ldalvik/system/DexFile;
-Ldalvik/system/DexPathList;->makeDexElements(Ljava/util/List;Ljava/io/File;Ljava/util/List;Ljava/lang/ClassLoader;)[Ldalvik/system/DexPathList$Element;
-Ldalvik/system/DexPathList;->makeInMemoryDexElements([Ljava/nio/ByteBuffer;Ljava/util/List;)[Ldalvik/system/DexPathList$Element;
-Ldalvik/system/DexPathList;->makePathElements(Ljava/util/List;)[Ldalvik/system/DexPathList$NativeLibraryElement;
-Ldalvik/system/DexPathList;->makePathElements(Ljava/util/List;Ljava/io/File;Ljava/util/List;)[Ldalvik/system/DexPathList$Element;
-Ldalvik/system/DexPathList;->nativeLibraryDirectories:Ljava/util/List;
-Ldalvik/system/DexPathList;->nativeLibraryPathElements:[Ldalvik/system/DexPathList$NativeLibraryElement;
-Ldalvik/system/DexPathList;->splitPaths(Ljava/lang/String;Z)Ljava/util/List;
-Ldalvik/system/DexPathList;->systemNativeLibraryDirectories:Ljava/util/List;
-Ldalvik/system/VMDebug;->dumpReferenceTables()V
-Ldalvik/system/VMDebug;->isDebuggerConnected()Z
-Ldalvik/system/VMRuntime;->addressOf(Ljava/lang/Object;)J
-Ldalvik/system/VMRuntime;->clearGrowthLimit()V
-Ldalvik/system/VMRuntime;->gcSoftReferences()V
-Ldalvik/system/VMRuntime;->getCurrentInstructionSet()Ljava/lang/String;
-Ldalvik/system/VMRuntime;->getExternalBytesAllocated()J
-Ldalvik/system/VMRuntime;->getInstructionSet(Ljava/lang/String;)Ljava/lang/String;
-Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
-Ldalvik/system/VMRuntime;->is64Bit()Z
-Ldalvik/system/VMRuntime;->is64BitAbi(Ljava/lang/String;)Z
-Ldalvik/system/VMRuntime;->newNonMovableArray(Ljava/lang/Class;I)Ljava/lang/Object;
-Ldalvik/system/VMRuntime;->registerNativeAllocation(I)V
-Ldalvik/system/VMRuntime;->registerNativeFree(I)V
-Ldalvik/system/VMRuntime;->runFinalization(J)V
-Ldalvik/system/VMRuntime;->setMinimumHeapSize(J)J
-Ldalvik/system/VMRuntime;->setTargetHeapUtilization(F)F
-Ldalvik/system/VMRuntime;->setTargetSdkVersion(I)V
-Ldalvik/system/VMRuntime;->trackExternalAllocation(J)Z
-Ldalvik/system/VMRuntime;->trackExternalFree(J)V
-Ldalvik/system/VMRuntime;->vmInstructionSet()Ljava/lang/String;
-Ldalvik/system/VMRuntime;->vmLibrary()Ljava/lang/String;
-Ldalvik/system/VMStack;->getCallingClassLoader()Ljava/lang/ClassLoader;
-Ldalvik/system/VMStack;->getStackClass2()Ljava/lang/Class;
-Ljava/awt/font/NumericShaper;->serialVersionUID:J
-Ljava/awt/font/NumericShaper;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/awt/font/TextAttribute;->serialVersionUID:J
-Ljava/beans/IndexedPropertyChangeEvent;->serialVersionUID:J
-Ljava/beans/PropertyChangeEvent;->serialVersionUID:J
-Ljava/beans/PropertyChangeSupport;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/beans/PropertyChangeSupport;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/beans/PropertyChangeSupport;->serialVersionUID:J
-Ljava/beans/PropertyChangeSupport;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/io/CharConversionException;->serialVersionUID:J
-Ljava/io/EOFException;->serialVersionUID:J
-Ljava/io/File;->filePath:Ljava/nio/file/Path;
-Ljava/io/File;->fs:Ljava/io/FileSystem;
-Ljava/io/File;->path:Ljava/lang/String;
-Ljava/io/File;->prefixLength:I
-Ljava/io/File;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/io/File;->serialVersionUID:J
-Ljava/io/File;->status:Ljava/io/File$PathStatus;
-Ljava/io/File;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/io/FileDescriptor;->descriptor:I
-Ljava/io/FileDescriptor;->getInt$()I
-Ljava/io/FileDescriptor;->isSocket$()Z
-Ljava/io/FileDescriptor;->setInt$(I)V
-Ljava/io/FileInputStream;->fd:Ljava/io/FileDescriptor;
-Ljava/io/FileNotFoundException;->serialVersionUID:J
-Ljava/io/FileOutputStream;->fd:Ljava/io/FileDescriptor;
-Ljava/io/IOError;->serialVersionUID:J
-Ljava/io/IOException;->serialVersionUID:J
-Ljava/io/InterruptedIOException;->serialVersionUID:J
-Ljava/io/InvalidClassException;->serialVersionUID:J
-Ljava/io/InvalidObjectException;->serialVersionUID:J
-Ljava/io/NotActiveException;->serialVersionUID:J
-Ljava/io/NotSerializableException;->serialVersionUID:J
-Ljava/io/ObjectStreamClass;->getConstructorId(Ljava/lang/Class;)J
-Ljava/io/ObjectStreamClass;->newInstance()Ljava/lang/Object;
-Ljava/io/ObjectStreamClass;->newInstance(Ljava/lang/Class;J)Ljava/lang/Object;
-Ljava/io/ObjectStreamClass;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/io/ObjectStreamClass;->serialVersionUID:J
-Ljava/io/ObjectStreamException;->serialVersionUID:J
-Ljava/io/OptionalDataException;->serialVersionUID:J
-Ljava/io/StreamCorruptedException;->serialVersionUID:J
-Ljava/io/SyncFailedException;->serialVersionUID:J
-Ljava/io/UTFDataFormatException;->serialVersionUID:J
-Ljava/io/UncheckedIOException;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/io/UncheckedIOException;->serialVersionUID:J
-Ljava/io/UnsupportedEncodingException;->serialVersionUID:J
-Ljava/io/WriteAbortedException;->serialVersionUID:J
-Ljava/lang/AbstractMethodError;->serialVersionUID:J
-Ljava/lang/AbstractStringBuilder;->value:[C
-Ljava/lang/ArithmeticException;->serialVersionUID:J
-Ljava/lang/ArrayIndexOutOfBoundsException;->serialVersionUID:J
-Ljava/lang/ArrayStoreException;->serialVersionUID:J
-Ljava/lang/AssertionError;->serialVersionUID:J
-Ljava/lang/Boolean;->serialVersionUID:J
-Ljava/lang/Boolean;->value:Z
-Ljava/lang/BootstrapMethodError;->serialVersionUID:J
-Ljava/lang/Byte;->serialVersionUID:J
-Ljava/lang/Byte;->value:B
-Ljava/lang/Character;->serialVersionUID:J
-Ljava/lang/Character;->value:C
-Ljava/lang/Class;->accessFlags:I
-Ljava/lang/Class;->dexCache:Ljava/lang/Object;
-Ljava/lang/Class;->dexClassDefIndex:I
-Ljava/lang/Class;->ifTable:[Ljava/lang/Object;
-Ljava/lang/Class;->serialVersionUID:J
-Ljava/lang/ClassCastException;->serialVersionUID:J
-Ljava/lang/ClassCircularityError;->serialVersionUID:J
-Ljava/lang/ClassFormatError;->serialVersionUID:J
-Ljava/lang/ClassLoader;->parent:Ljava/lang/ClassLoader;
-Ljava/lang/ClassNotFoundException;->serialVersionUID:J
-Ljava/lang/CloneNotSupportedException;->serialVersionUID:J
-Ljava/lang/Daemons$Daemon;->isRunning()Z
-Ljava/lang/Daemons$Daemon;->start()V
-Ljava/lang/Daemons$Daemon;->stop()V
-Ljava/lang/Daemons$Daemon;->thread:Ljava/lang/Thread;
-Ljava/lang/Daemons$FinalizerDaemon;->INSTANCE:Ljava/lang/Daemons$FinalizerDaemon;
-Ljava/lang/Daemons$FinalizerDaemon;->finalizingObject:Ljava/lang/Object;
-Ljava/lang/Daemons$FinalizerWatchdogDaemon;->INSTANCE:Ljava/lang/Daemons$FinalizerWatchdogDaemon;
-Ljava/lang/Daemons$ReferenceQueueDaemon;->INSTANCE:Ljava/lang/Daemons$ReferenceQueueDaemon;
-Ljava/lang/Daemons;->MAX_FINALIZE_NANOS:J
-Ljava/lang/Daemons;->requestHeapTrim()V
-Ljava/lang/Daemons;->start()V
-Ljava/lang/Daemons;->stop()V
-Ljava/lang/Double;->serialVersionUID:J
-Ljava/lang/Double;->value:D
-Ljava/lang/Enum;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/lang/Enum;->readObjectNoData()V
-Ljava/lang/EnumConstantNotPresentException;->serialVersionUID:J
-Ljava/lang/Error;->serialVersionUID:J
-Ljava/lang/Exception;->serialVersionUID:J
-Ljava/lang/ExceptionInInitializerError;->serialVersionUID:J
-Ljava/lang/Float;->serialVersionUID:J
-Ljava/lang/Float;->value:F
-Ljava/lang/IllegalAccessError;->serialVersionUID:J
-Ljava/lang/IllegalAccessException;->serialVersionUID:J
-Ljava/lang/IllegalArgumentException;->serialVersionUID:J
-Ljava/lang/IllegalMonitorStateException;->serialVersionUID:J
-Ljava/lang/IllegalStateException;->serialVersionUID:J
-Ljava/lang/IllegalThreadStateException;->serialVersionUID:J
-Ljava/lang/IncompatibleClassChangeError;->serialVersionUID:J
-Ljava/lang/IndexOutOfBoundsException;->serialVersionUID:J
-Ljava/lang/InstantiationError;->serialVersionUID:J
-Ljava/lang/InstantiationException;->serialVersionUID:J
-Ljava/lang/Integer;->serialVersionUID:J
-Ljava/lang/Integer;->value:I
-Ljava/lang/InternalError;->serialVersionUID:J
-Ljava/lang/InterruptedException;->serialVersionUID:J
-Ljava/lang/LinkageError;->serialVersionUID:J
-Ljava/lang/Long;->serialVersionUID:J
-Ljava/lang/Long;->value:J
-Ljava/lang/NegativeArraySizeException;->serialVersionUID:J
-Ljava/lang/NoClassDefFoundError;->serialVersionUID:J
-Ljava/lang/NoSuchFieldError;->serialVersionUID:J
-Ljava/lang/NoSuchFieldException;->serialVersionUID:J
-Ljava/lang/NoSuchMethodError;->serialVersionUID:J
-Ljava/lang/NoSuchMethodException;->serialVersionUID:J
-Ljava/lang/NullPointerException;->serialVersionUID:J
-Ljava/lang/Number;->serialVersionUID:J
-Ljava/lang/NumberFormatException;->serialVersionUID:J
-Ljava/lang/OutOfMemoryError;->serialVersionUID:J
-Ljava/lang/ReflectiveOperationException;->serialVersionUID:J
-Ljava/lang/Runtime;->load(Ljava/lang/String;Ljava/lang/ClassLoader;)V
-Ljava/lang/Runtime;->loadLibrary(Ljava/lang/String;Ljava/lang/ClassLoader;)V
-Ljava/lang/Runtime;->mLibPaths:[Ljava/lang/String;
-Ljava/lang/Runtime;->nativeLoad(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/String;
-Ljava/lang/RuntimeException;->serialVersionUID:J
-Ljava/lang/RuntimePermission;->serialVersionUID:J
-Ljava/lang/SecurityException;->serialVersionUID:J
-Ljava/lang/Short;->serialVersionUID:J
-Ljava/lang/Short;->value:S
-Ljava/lang/StackOverflowError;->serialVersionUID:J
-Ljava/lang/StackTraceElement;->serialVersionUID:J
-Ljava/lang/String$CaseInsensitiveComparator;->readResolve()Ljava/lang/Object;
-Ljava/lang/String$CaseInsensitiveComparator;->serialVersionUID:J
-Ljava/lang/String;-><init>(II[C)V
-Ljava/lang/String;->getCharsNoCheck(II[CI)V
-Ljava/lang/String;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/lang/String;->serialVersionUID:J
-Ljava/lang/StringBuffer;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/lang/StringBuffer;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/lang/StringBuffer;->serialVersionUID:J
-Ljava/lang/StringBuffer;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/lang/StringBuilder;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/lang/StringBuilder;->serialVersionUID:J
-Ljava/lang/StringBuilder;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/lang/StringIndexOutOfBoundsException;->serialVersionUID:J
-Ljava/lang/System;-><init>()V
-Ljava/lang/System;->arraycopy([BI[BII)V
-Ljava/lang/System;->arraycopy([CI[CII)V
-Ljava/lang/System;->arraycopy([II[III)V
-Ljava/lang/Thread;-><init>(Ljava/lang/ThreadGroup;Ljava/lang/String;IZ)V
-Ljava/lang/Thread;->contextClassLoader:Ljava/lang/ClassLoader;
-Ljava/lang/Thread;->daemon:Z
-Ljava/lang/Thread;->dispatchUncaughtException(Ljava/lang/Throwable;)V
-Ljava/lang/Thread;->group:Ljava/lang/ThreadGroup;
-Ljava/lang/Thread;->inheritableThreadLocals:Ljava/lang/ThreadLocal$ThreadLocalMap;
-Ljava/lang/Thread;->lock:Ljava/lang/Object;
-Ljava/lang/Thread;->name:Ljava/lang/String;
-Ljava/lang/Thread;->nativePeer:J
-Ljava/lang/Thread;->parkBlocker:Ljava/lang/Object;
-Ljava/lang/Thread;->priority:I
-Ljava/lang/Thread;->threadLocals:Ljava/lang/ThreadLocal$ThreadLocalMap;
-Ljava/lang/ThreadDeath;->serialVersionUID:J
-Ljava/lang/ThreadGroup;->add(Ljava/lang/Thread;)V
-Ljava/lang/ThreadGroup;->groups:[Ljava/lang/ThreadGroup;
-Ljava/lang/ThreadGroup;->mainThreadGroup:Ljava/lang/ThreadGroup;
-Ljava/lang/ThreadGroup;->name:Ljava/lang/String;
-Ljava/lang/ThreadGroup;->ngroups:I
-Ljava/lang/ThreadGroup;->parent:Ljava/lang/ThreadGroup;
-Ljava/lang/ThreadGroup;->systemThreadGroup:Ljava/lang/ThreadGroup;
-Ljava/lang/ThreadGroup;->threadTerminated(Ljava/lang/Thread;)V
-Ljava/lang/Throwable;->backtrace:Ljava/lang/Object;
-Ljava/lang/Throwable;->cause:Ljava/lang/Throwable;
-Ljava/lang/Throwable;->detailMessage:Ljava/lang/String;
-Ljava/lang/Throwable;->nativeFillInStackTrace()Ljava/lang/Object;
-Ljava/lang/Throwable;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/lang/Throwable;->serialVersionUID:J
-Ljava/lang/Throwable;->stackTrace:[Ljava/lang/StackTraceElement;
-Ljava/lang/Throwable;->suppressedExceptions:Ljava/util/List;
-Ljava/lang/Throwable;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/lang/TypeNotPresentException;->serialVersionUID:J
-Ljava/lang/UnknownError;->serialVersionUID:J
-Ljava/lang/UnsatisfiedLinkError;->serialVersionUID:J
-Ljava/lang/UnsupportedClassVersionError;->serialVersionUID:J
-Ljava/lang/UnsupportedOperationException;->serialVersionUID:J
-Ljava/lang/VerifyError;->serialVersionUID:J
-Ljava/lang/VirtualMachineError;->serialVersionUID:J
-Ljava/lang/Void;-><init>()V
-Ljava/lang/annotation/AnnotationFormatError;->serialVersionUID:J
-Ljava/lang/annotation/AnnotationTypeMismatchException;->serialVersionUID:J
-Ljava/lang/annotation/IncompleteAnnotationException;->serialVersionUID:J
-Ljava/lang/invoke/LambdaConversionException;->serialVersionUID:J
-Ljava/lang/invoke/MethodHandles$Lookup;-><init>(Ljava/lang/Class;I)V
-Ljava/lang/invoke/MethodType;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/lang/invoke/MethodType;->readResolve()Ljava/lang/Object;
-Ljava/lang/invoke/MethodType;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/lang/invoke/MethodType;->serialVersionUID:J
-Ljava/lang/invoke/MethodType;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/lang/invoke/WrongMethodTypeException;->serialVersionUID:J
-Ljava/lang/ref/FinalizerReference;->add(Ljava/lang/Object;)V
-Ljava/lang/ref/FinalizerReference;->head:Ljava/lang/ref/FinalizerReference;
-Ljava/lang/ref/FinalizerReference;->next:Ljava/lang/ref/FinalizerReference;
-Ljava/lang/ref/FinalizerReference;->queue:Ljava/lang/ref/ReferenceQueue;
-Ljava/lang/ref/FinalizerReference;->remove(Ljava/lang/ref/FinalizerReference;)V
-Ljava/lang/ref/Reference;->getReferent()Ljava/lang/Object;
-Ljava/lang/ref/Reference;->referent:Ljava/lang/Object;
-Ljava/lang/ref/ReferenceQueue;->add(Ljava/lang/ref/Reference;)V
-Ljava/lang/reflect/Executable;->artMethod:J
-Ljava/lang/reflect/Field;->accessFlags:I
-Ljava/lang/reflect/GenericSignatureFormatError;->serialVersionUID:J
-Ljava/lang/reflect/InvocationTargetException;->serialVersionUID:J
-Ljava/lang/reflect/MalformedParameterizedTypeException;->serialVersionUID:J
-Ljava/lang/reflect/MalformedParametersException;->serialVersionUID:J
-Ljava/lang/reflect/Parameter;-><init>(Ljava/lang/String;ILjava/lang/reflect/Executable;I)V
-Ljava/lang/reflect/Proxy;->invoke(Ljava/lang/reflect/Proxy;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
-Ljava/lang/reflect/Proxy;->serialVersionUID:J
-Ljava/lang/reflect/UndeclaredThrowableException;->serialVersionUID:J
-Ljava/math/BigDecimal;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/math/BigDecimal;->serialVersionUID:J
-Ljava/math/BigDecimal;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/math/BigInteger;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/math/BigInteger;->serialVersionUID:J
-Ljava/math/BigInteger;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/math/MathContext;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/math/MathContext;->serialVersionUID:J
-Ljava/net/Authenticator;->theAuthenticator:Ljava/net/Authenticator;
-Ljava/net/BindException;->serialVersionUID:J
-Ljava/net/ConnectException;->serialVersionUID:J
-Ljava/net/DatagramSocket;->impl:Ljava/net/DatagramSocketImpl;
-Ljava/net/HttpCookie;->assignors:Ljava/util/Map;
-Ljava/net/HttpCookie;->comment:Ljava/lang/String;
-Ljava/net/HttpCookie;->commentURL:Ljava/lang/String;
-Ljava/net/HttpCookie;->domain:Ljava/lang/String;
-Ljava/net/HttpCookie;->header:Ljava/lang/String;
-Ljava/net/HttpCookie;->httpOnly:Z
-Ljava/net/HttpCookie;->maxAge:J
-Ljava/net/HttpCookie;->name:Ljava/lang/String;
-Ljava/net/HttpCookie;->path:Ljava/lang/String;
-Ljava/net/HttpCookie;->portlist:Ljava/lang/String;
-Ljava/net/HttpCookie;->secure:Z
-Ljava/net/HttpCookie;->toDiscard:Z
-Ljava/net/HttpCookie;->tspecials:Ljava/lang/String;
-Ljava/net/HttpCookie;->value:Ljava/lang/String;
-Ljava/net/HttpCookie;->version:I
-Ljava/net/HttpCookie;->whenCreated:J
-Ljava/net/HttpRetryException;->serialVersionUID:J
-Ljava/net/Inet4Address;-><init>()V
-Ljava/net/Inet4Address;->ALL:Ljava/net/InetAddress;
-Ljava/net/Inet4Address;->ANY:Ljava/net/InetAddress;
-Ljava/net/Inet4Address;->serialVersionUID:J
-Ljava/net/Inet4Address;->writeReplace()Ljava/lang/Object;
-Ljava/net/Inet6Address$Inet6AddressHolder;->ipaddress:[B
-Ljava/net/Inet6Address$Inet6AddressHolder;->scope_id:I
-Ljava/net/Inet6Address$Inet6AddressHolder;->scope_id_set:Z
-Ljava/net/Inet6Address$Inet6AddressHolder;->scope_ifname:Ljava/net/NetworkInterface;
-Ljava/net/Inet6Address;-><init>()V
-Ljava/net/Inet6Address;->ANY:Ljava/net/InetAddress;
-Ljava/net/Inet6Address;->holder6:Ljava/net/Inet6Address$Inet6AddressHolder;
-Ljava/net/Inet6Address;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/net/Inet6Address;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/net/Inet6Address;->serialVersionUID:J
-Ljava/net/Inet6Address;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/net/InetAddress$InetAddressHolder;->address:I
-Ljava/net/InetAddress$InetAddressHolder;->family:I
-Ljava/net/InetAddress$InetAddressHolder;->hostName:Ljava/lang/String;
-Ljava/net/InetAddress$InetAddressHolder;->originalHostName:Ljava/lang/String;
-Ljava/net/InetAddress;->clearDnsCache()V
-Ljava/net/InetAddress;->holder()Ljava/net/InetAddress$InetAddressHolder;
-Ljava/net/InetAddress;->holder:Ljava/net/InetAddress$InetAddressHolder;
-Ljava/net/InetAddress;->isNumeric(Ljava/lang/String;)Z
-Ljava/net/InetAddress;->parseNumericAddress(Ljava/lang/String;)Ljava/net/InetAddress;
-Ljava/net/InetAddress;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/net/InetAddress;->readResolve()Ljava/lang/Object;
-Ljava/net/InetAddress;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/net/InetAddress;->serialVersionUID:J
-Ljava/net/InetAddress;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/net/InetSocketAddress;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/net/InetSocketAddress;->readObjectNoData()V
-Ljava/net/InetSocketAddress;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/net/InetSocketAddress;->serialVersionUID:J
-Ljava/net/InetSocketAddress;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/net/MalformedURLException;->serialVersionUID:J
-Ljava/net/NoRouteToHostException;->serialVersionUID:J
-Ljava/net/PortUnreachableException;->serialVersionUID:J
-Ljava/net/ProtocolException;->serialVersionUID:J
-Ljava/net/Socket;->getFileDescriptor$()Ljava/io/FileDescriptor;
-Ljava/net/Socket;->impl:Ljava/net/SocketImpl;
-Ljava/net/SocketAddress;->serialVersionUID:J
-Ljava/net/SocketException;->serialVersionUID:J
-Ljava/net/SocketImpl;->serverSocket:Ljava/net/ServerSocket;
-Ljava/net/SocketImpl;->socket:Ljava/net/Socket;
-Ljava/net/SocketTimeoutException;->serialVersionUID:J
-Ljava/net/URI;->fragment:Ljava/lang/String;
-Ljava/net/URI;->host:Ljava/lang/String;
-Ljava/net/URI;->port:I
-Ljava/net/URI;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/net/URI;->serialVersionUID:J
-Ljava/net/URI;->string:Ljava/lang/String;
-Ljava/net/URI;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/net/URISyntaxException;->serialVersionUID:J
-Ljava/net/URL;->handler:Ljava/net/URLStreamHandler;
-Ljava/net/URL;->handlers:Ljava/util/Hashtable;
-Ljava/net/URL;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/net/URL;->readResolve()Ljava/lang/Object;
-Ljava/net/URL;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/net/URL;->serialVersionUID:J
-Ljava/net/URL;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/net/UnknownHostException;->serialVersionUID:J
-Ljava/net/UnknownServiceException;->serialVersionUID:J
-Ljava/nio/Buffer;->_elementSizeShift:I
-Ljava/nio/Buffer;->address:J
-Ljava/nio/Buffer;->capacity:I
-Ljava/nio/Buffer;->limit:I
-Ljava/nio/Buffer;->position:I
-Ljava/nio/BufferOverflowException;->serialVersionUID:J
-Ljava/nio/BufferUnderflowException;->serialVersionUID:J
-Ljava/nio/ByteBuffer;->hb:[B
-Ljava/nio/ByteBuffer;->isReadOnly:Z
-Ljava/nio/ByteBuffer;->offset:I
-Ljava/nio/DirectByteBuffer;-><init>(JI)V
-Ljava/nio/InvalidMarkException;->serialVersionUID:J
-Ljava/nio/NIOAccess;->getBaseArray(Ljava/nio/Buffer;)Ljava/lang/Object;
-Ljava/nio/NIOAccess;->getBaseArrayOffset(Ljava/nio/Buffer;)I
-Ljava/nio/NIOAccess;->getBasePointer(Ljava/nio/Buffer;)J
-Ljava/nio/ReadOnlyBufferException;->serialVersionUID:J
-Ljava/nio/channels/AcceptPendingException;->serialVersionUID:J
-Ljava/nio/channels/AlreadyBoundException;->serialVersionUID:J
-Ljava/nio/channels/AlreadyConnectedException;->serialVersionUID:J
-Ljava/nio/channels/AsynchronousCloseException;->serialVersionUID:J
-Ljava/nio/channels/CancelledKeyException;->serialVersionUID:J
-Ljava/nio/channels/ClosedByInterruptException;->serialVersionUID:J
-Ljava/nio/channels/ClosedChannelException;->serialVersionUID:J
-Ljava/nio/channels/ClosedSelectorException;->serialVersionUID:J
-Ljava/nio/channels/ConnectionPendingException;->serialVersionUID:J
-Ljava/nio/channels/FileLockInterruptionException;->serialVersionUID:J
-Ljava/nio/channels/IllegalBlockingModeException;->serialVersionUID:J
-Ljava/nio/channels/IllegalChannelGroupException;->serialVersionUID:J
-Ljava/nio/channels/IllegalSelectorException;->serialVersionUID:J
-Ljava/nio/channels/InterruptedByTimeoutException;->serialVersionUID:J
-Ljava/nio/channels/NoConnectionPendingException;->serialVersionUID:J
-Ljava/nio/channels/NonReadableChannelException;->serialVersionUID:J
-Ljava/nio/channels/NonWritableChannelException;->serialVersionUID:J
-Ljava/nio/channels/NotYetBoundException;->serialVersionUID:J
-Ljava/nio/channels/NotYetConnectedException;->serialVersionUID:J
-Ljava/nio/channels/OverlappingFileLockException;->serialVersionUID:J
-Ljava/nio/channels/ReadPendingException;->serialVersionUID:J
-Ljava/nio/channels/ShutdownChannelGroupException;->serialVersionUID:J
-Ljava/nio/channels/UnresolvedAddressException;->serialVersionUID:J
-Ljava/nio/channels/UnsupportedAddressTypeException;->serialVersionUID:J
-Ljava/nio/channels/WritePendingException;->serialVersionUID:J
-Ljava/nio/charset/CharacterCodingException;->serialVersionUID:J
-Ljava/nio/charset/CharsetEncoder;->canEncode(Ljava/nio/CharBuffer;)Z
-Ljava/nio/charset/CoderMalfunctionError;->serialVersionUID:J
-Ljava/nio/charset/IllegalCharsetNameException;->serialVersionUID:J
-Ljava/nio/charset/MalformedInputException;->serialVersionUID:J
-Ljava/nio/charset/UnmappableCharacterException;->serialVersionUID:J
-Ljava/nio/charset/UnsupportedCharsetException;->serialVersionUID:J
-Ljava/nio/file/AccessDeniedException;->serialVersionUID:J
-Ljava/nio/file/AtomicMoveNotSupportedException;->serialVersionUID:J
-Ljava/nio/file/ClosedDirectoryStreamException;->serialVersionUID:J
-Ljava/nio/file/ClosedFileSystemException;->serialVersionUID:J
-Ljava/nio/file/ClosedWatchServiceException;->serialVersionUID:J
-Ljava/nio/file/DirectoryIteratorException;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/nio/file/DirectoryIteratorException;->serialVersionUID:J
-Ljava/nio/file/DirectoryNotEmptyException;->serialVersionUID:J
-Ljava/nio/file/FileAlreadyExistsException;->serialVersionUID:J
-Ljava/nio/file/FileSystemAlreadyExistsException;->serialVersionUID:J
-Ljava/nio/file/FileSystemException;->serialVersionUID:J
-Ljava/nio/file/FileSystemLoopException;->serialVersionUID:J
-Ljava/nio/file/FileSystemNotFoundException;->serialVersionUID:J
-Ljava/nio/file/InvalidPathException;->serialVersionUID:J
-Ljava/nio/file/LinkPermission;->serialVersionUID:J
-Ljava/nio/file/NoSuchFileException;->serialVersionUID:J
-Ljava/nio/file/NotDirectoryException;->serialVersionUID:J
-Ljava/nio/file/NotLinkException;->serialVersionUID:J
-Ljava/nio/file/ProviderMismatchException;->serialVersionUID:J
-Ljava/nio/file/ProviderNotFoundException;->serialVersionUID:J
-Ljava/nio/file/ReadOnlyFileSystemException;->serialVersionUID:J
-Ljava/nio/file/attribute/UserPrincipalNotFoundException;->serialVersionUID:J
-Ljava/security/AccessControlException;->serialVersionUID:J
-Ljava/security/CodeSigner;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/security/CodeSigner;->serialVersionUID:J
-Ljava/security/DigestException;->serialVersionUID:J
-Ljava/security/GeneralSecurityException;->serialVersionUID:J
-Ljava/security/GuardedObject;->serialVersionUID:J
-Ljava/security/GuardedObject;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/security/Identity;->serialVersionUID:J
-Ljava/security/IdentityScope;->serialVersionUID:J
-Ljava/security/InvalidAlgorithmParameterException;->serialVersionUID:J
-Ljava/security/InvalidKeyException;->serialVersionUID:J
-Ljava/security/InvalidParameterException;->serialVersionUID:J
-Ljava/security/KeyException;->serialVersionUID:J
-Ljava/security/KeyManagementException;->serialVersionUID:J
-Ljava/security/KeyPair;->serialVersionUID:J
-Ljava/security/KeyRep;->serialVersionUID:J
-Ljava/security/KeyStoreException;->serialVersionUID:J
-Ljava/security/NoSuchAlgorithmException;->serialVersionUID:J
-Ljava/security/NoSuchProviderException;->serialVersionUID:J
-Ljava/security/PrivilegedActionException;->serialVersionUID:J
-Ljava/security/Provider;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/security/Provider;->serialVersionUID:J
-Ljava/security/ProviderException;->serialVersionUID:J
-Ljava/security/SecureRandom;->serialVersionUID:J
-Ljava/security/SecureRandomSpi;->serialVersionUID:J
-Ljava/security/SignatureException;->serialVersionUID:J
-Ljava/security/SignedObject;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/security/SignedObject;->serialVersionUID:J
-Ljava/security/Signer;->serialVersionUID:J
-Ljava/security/Timestamp;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/security/Timestamp;->serialVersionUID:J
-Ljava/security/UnrecoverableEntryException;->serialVersionUID:J
-Ljava/security/UnrecoverableKeyException;->serialVersionUID:J
-Ljava/security/acl/AclNotFoundException;->serialVersionUID:J
-Ljava/security/acl/LastOwnerException;->serialVersionUID:J
-Ljava/security/acl/NotOwnerException;->serialVersionUID:J
-Ljava/security/cert/CRLException;->serialVersionUID:J
-Ljava/security/cert/CertPath$CertPathRep;->serialVersionUID:J
-Ljava/security/cert/CertPath;->serialVersionUID:J
-Ljava/security/cert/CertPathBuilderException;->serialVersionUID:J
-Ljava/security/cert/CertPathValidatorException;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/security/cert/CertPathValidatorException;->serialVersionUID:J
-Ljava/security/cert/CertStoreException;->serialVersionUID:J
-Ljava/security/cert/Certificate$CertificateRep;->serialVersionUID:J
-Ljava/security/cert/Certificate;->serialVersionUID:J
-Ljava/security/cert/CertificateEncodingException;->serialVersionUID:J
-Ljava/security/cert/CertificateException;->serialVersionUID:J
-Ljava/security/cert/CertificateExpiredException;->serialVersionUID:J
-Ljava/security/cert/CertificateNotYetValidException;->serialVersionUID:J
-Ljava/security/cert/CertificateParsingException;->serialVersionUID:J
-Ljava/security/cert/CertificateRevokedException;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/security/cert/CertificateRevokedException;->serialVersionUID:J
-Ljava/security/cert/CertificateRevokedException;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/security/cert/X509Certificate;->serialVersionUID:J
-Ljava/security/spec/ECParameterSpec;->getCurveName()Ljava/lang/String;
-Ljava/security/spec/ECParameterSpec;->setCurveName(Ljava/lang/String;)V
-Ljava/security/spec/InvalidKeySpecException;->serialVersionUID:J
-Ljava/security/spec/InvalidParameterSpecException;->serialVersionUID:J
-Ljava/sql/BatchUpdateException;->serialVersionUID:J
-Ljava/sql/DataTruncation;->serialVersionUID:J
-Ljava/sql/Date;->serialVersionUID:J
-Ljava/sql/SQLClientInfoException;->serialVersionUID:J
-Ljava/sql/SQLDataException;->serialVersionUID:J
-Ljava/sql/SQLException;->serialVersionUID:J
-Ljava/sql/SQLFeatureNotSupportedException;->serialVersionUID:J
-Ljava/sql/SQLIntegrityConstraintViolationException;->serialVersionUID:J
-Ljava/sql/SQLInvalidAuthorizationSpecException;->serialVersionUID:J
-Ljava/sql/SQLNonTransientConnectionException;->serialVersionUID:J
-Ljava/sql/SQLNonTransientException;->serialVersionUID:J
-Ljava/sql/SQLRecoverableException;->serialVersionUID:J
-Ljava/sql/SQLSyntaxErrorException;->serialVersionUID:J
-Ljava/sql/SQLTimeoutException;->serialVersionUID:J
-Ljava/sql/SQLTransactionRollbackException;->serialVersionUID:J
-Ljava/sql/SQLTransientConnectionException;->serialVersionUID:J
-Ljava/sql/SQLTransientException;->serialVersionUID:J
-Ljava/sql/SQLWarning;->serialVersionUID:J
-Ljava/sql/Time;->serialVersionUID:J
-Ljava/sql/Timestamp;->serialVersionUID:J
-Ljava/text/AttributedCharacterIterator$Attribute;->serialVersionUID:J
-Ljava/text/ChoiceFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/text/ChoiceFormat;->serialVersionUID:J
-Ljava/text/DateFormat$Field;->serialVersionUID:J
-Ljava/text/DateFormat;->is24Hour:Ljava/lang/Boolean;
-Ljava/text/DateFormat;->serialVersionUID:J
-Ljava/text/DateFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/text/DateFormatSymbols;->serialVersionUID:J
-Ljava/text/DateFormatSymbols;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/text/DecimalFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/text/DecimalFormat;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/text/DecimalFormat;->serialVersionUID:J
-Ljava/text/DecimalFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/text/DecimalFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/text/DecimalFormatSymbols;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/text/DecimalFormatSymbols;->serialVersionUID:J
-Ljava/text/DecimalFormatSymbols;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/text/Format$Field;->serialVersionUID:J
-Ljava/text/Format;->serialVersionUID:J
-Ljava/text/MessageFormat$Field;->serialVersionUID:J
-Ljava/text/MessageFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/text/MessageFormat;->serialVersionUID:J
-Ljava/text/NumberFormat$Field;->serialVersionUID:J
-Ljava/text/NumberFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/text/NumberFormat;->serialVersionUID:J
-Ljava/text/NumberFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/text/ParseException;->serialVersionUID:J
-Ljava/text/SimpleDateFormat;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/text/SimpleDateFormat;->serialVersionUID:J
-Ljava/time/Clock$FixedClock;->serialVersionUID:J
-Ljava/time/Clock$OffsetClock;->serialVersionUID:J
-Ljava/time/Clock$SystemClock;->serialVersionUID:J
-Ljava/time/Clock$TickClock;->serialVersionUID:J
-Ljava/time/DateTimeException;->serialVersionUID:J
-Ljava/time/Duration;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/Duration;->serialVersionUID:J
-Ljava/time/Duration;->toSeconds()Ljava/math/BigDecimal;
-Ljava/time/Duration;->writeReplace()Ljava/lang/Object;
-Ljava/time/Instant;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/Instant;->serialVersionUID:J
-Ljava/time/Instant;->writeReplace()Ljava/lang/Object;
-Ljava/time/LocalDate;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/LocalDate;->serialVersionUID:J
-Ljava/time/LocalDate;->writeReplace()Ljava/lang/Object;
-Ljava/time/LocalDateTime;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/LocalDateTime;->serialVersionUID:J
-Ljava/time/LocalDateTime;->writeReplace()Ljava/lang/Object;
-Ljava/time/LocalTime;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/LocalTime;->serialVersionUID:J
-Ljava/time/LocalTime;->writeReplace()Ljava/lang/Object;
-Ljava/time/MonthDay;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/MonthDay;->serialVersionUID:J
-Ljava/time/MonthDay;->writeReplace()Ljava/lang/Object;
-Ljava/time/OffsetDateTime;-><init>(Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;)V
-Ljava/time/OffsetDateTime;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/OffsetDateTime;->serialVersionUID:J
-Ljava/time/OffsetDateTime;->writeReplace()Ljava/lang/Object;
-Ljava/time/OffsetTime;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/OffsetTime;->serialVersionUID:J
-Ljava/time/OffsetTime;->writeReplace()Ljava/lang/Object;
-Ljava/time/Period;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/Period;->serialVersionUID:J
-Ljava/time/Period;->writeReplace()Ljava/lang/Object;
-Ljava/time/Year;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/Year;->serialVersionUID:J
-Ljava/time/Year;->writeReplace()Ljava/lang/Object;
-Ljava/time/YearMonth;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/YearMonth;->serialVersionUID:J
-Ljava/time/YearMonth;->writeReplace()Ljava/lang/Object;
-Ljava/time/ZoneId;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/ZoneId;->serialVersionUID:J
-Ljava/time/ZoneId;->writeReplace()Ljava/lang/Object;
-Ljava/time/ZoneOffset;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/ZoneOffset;->serialVersionUID:J
-Ljava/time/ZoneOffset;->writeReplace()Ljava/lang/Object;
-Ljava/time/ZonedDateTime;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/ZonedDateTime;->serialVersionUID:J
-Ljava/time/ZonedDateTime;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/AbstractChronology;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/AbstractChronology;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/ChronoLocalDateImpl;->serialVersionUID:J
-Ljava/time/chrono/HijrahChronology;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/HijrahChronology;->serialVersionUID:J
-Ljava/time/chrono/HijrahChronology;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/HijrahDate;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/HijrahDate;->serialVersionUID:J
-Ljava/time/chrono/HijrahDate;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/IsoChronology;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/IsoChronology;->serialVersionUID:J
-Ljava/time/chrono/IsoChronology;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/JapaneseChronology;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/JapaneseChronology;->serialVersionUID:J
-Ljava/time/chrono/JapaneseChronology;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/JapaneseDate;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/JapaneseDate;->serialVersionUID:J
-Ljava/time/chrono/JapaneseDate;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/JapaneseEra;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/JapaneseEra;->serialVersionUID:J
-Ljava/time/chrono/JapaneseEra;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/MinguoChronology;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/MinguoChronology;->serialVersionUID:J
-Ljava/time/chrono/MinguoChronology;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/MinguoDate;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/MinguoDate;->serialVersionUID:J
-Ljava/time/chrono/MinguoDate;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/ThaiBuddhistChronology;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/ThaiBuddhistChronology;->serialVersionUID:J
-Ljava/time/chrono/ThaiBuddhistChronology;->writeReplace()Ljava/lang/Object;
-Ljava/time/chrono/ThaiBuddhistDate;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/chrono/ThaiBuddhistDate;->serialVersionUID:J
-Ljava/time/chrono/ThaiBuddhistDate;->writeReplace()Ljava/lang/Object;
-Ljava/time/format/DateTimeParseException;->serialVersionUID:J
-Ljava/time/temporal/JulianFields$Field;->serialVersionUID:J
-Ljava/time/temporal/UnsupportedTemporalTypeException;->serialVersionUID:J
-Ljava/time/temporal/ValueRange;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/temporal/ValueRange;->serialVersionUID:J
-Ljava/time/temporal/WeekFields;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/temporal/WeekFields;->readResolve()Ljava/lang/Object;
-Ljava/time/temporal/WeekFields;->serialVersionUID:J
-Ljava/time/zone/ZoneOffsetTransition;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/zone/ZoneOffsetTransition;->serialVersionUID:J
-Ljava/time/zone/ZoneOffsetTransition;->writeReplace()Ljava/lang/Object;
-Ljava/time/zone/ZoneOffsetTransitionRule;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/zone/ZoneOffsetTransitionRule;->serialVersionUID:J
-Ljava/time/zone/ZoneOffsetTransitionRule;->writeReplace()Ljava/lang/Object;
-Ljava/time/zone/ZoneRules;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/time/zone/ZoneRules;->serialVersionUID:J
-Ljava/time/zone/ZoneRules;->writeReplace()Ljava/lang/Object;
-Ljava/time/zone/ZoneRulesException;->serialVersionUID:J
-Ljava/util/AbstractMap$SimpleEntry;->serialVersionUID:J
-Ljava/util/AbstractMap$SimpleImmutableEntry;->serialVersionUID:J
-Ljava/util/ArrayDeque;->elements:[Ljava/lang/Object;
-Ljava/util/ArrayDeque;->head:I
-Ljava/util/ArrayDeque;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/ArrayDeque;->serialVersionUID:J
-Ljava/util/ArrayDeque;->tail:I
-Ljava/util/ArrayDeque;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/ArrayList$SubList;->parent:Ljava/util/AbstractList;
-Ljava/util/ArrayList$SubList;->parentOffset:I
-Ljava/util/ArrayList$SubList;->size:I
-Ljava/util/ArrayList;->elementData:[Ljava/lang/Object;
-Ljava/util/ArrayList;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/ArrayList;->serialVersionUID:J
-Ljava/util/ArrayList;->size:I
-Ljava/util/ArrayList;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/Arrays$ArrayList;->a:[Ljava/lang/Object;
-Ljava/util/Arrays$ArrayList;->serialVersionUID:J
-Ljava/util/BitSet;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/BitSet;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/util/BitSet;->serialVersionUID:J
-Ljava/util/BitSet;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/Calendar;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/Calendar;->serialVersionUID:J
-Ljava/util/Calendar;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/Calendar;->zone:Ljava/util/TimeZone;
-Ljava/util/Collections$AsLIFOQueue;->serialVersionUID:J
-Ljava/util/Collections$CheckedCollection;->serialVersionUID:J
-Ljava/util/Collections$CheckedList;->serialVersionUID:J
-Ljava/util/Collections$CheckedMap;->serialVersionUID:J
-Ljava/util/Collections$CheckedNavigableMap;->serialVersionUID:J
-Ljava/util/Collections$CheckedNavigableSet;->serialVersionUID:J
-Ljava/util/Collections$CheckedQueue;->serialVersionUID:J
-Ljava/util/Collections$CheckedRandomAccessList;->serialVersionUID:J
-Ljava/util/Collections$CheckedSet;->serialVersionUID:J
-Ljava/util/Collections$CheckedSortedMap;->serialVersionUID:J
-Ljava/util/Collections$CheckedSortedSet;->serialVersionUID:J
-Ljava/util/Collections$CopiesList;->serialVersionUID:J
-Ljava/util/Collections$EmptyList;-><init>()V
-Ljava/util/Collections$EmptyList;->readResolve()Ljava/lang/Object;
-Ljava/util/Collections$EmptyList;->serialVersionUID:J
-Ljava/util/Collections$EmptyMap;->readResolve()Ljava/lang/Object;
-Ljava/util/Collections$EmptyMap;->serialVersionUID:J
-Ljava/util/Collections$EmptySet;->readResolve()Ljava/lang/Object;
-Ljava/util/Collections$EmptySet;->serialVersionUID:J
-Ljava/util/Collections$ReverseComparator2;->serialVersionUID:J
-Ljava/util/Collections$ReverseComparator;->readResolve()Ljava/lang/Object;
-Ljava/util/Collections$ReverseComparator;->serialVersionUID:J
-Ljava/util/Collections$SetFromMap;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/Collections$SetFromMap;->serialVersionUID:J
-Ljava/util/Collections$SingletonList;->serialVersionUID:J
-Ljava/util/Collections$SingletonMap;->serialVersionUID:J
-Ljava/util/Collections$SingletonSet;->serialVersionUID:J
-Ljava/util/Collections$SynchronizedCollection;->c:Ljava/util/Collection;
-Ljava/util/Collections$SynchronizedCollection;->serialVersionUID:J
-Ljava/util/Collections$SynchronizedCollection;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/Collections$SynchronizedList;->readResolve()Ljava/lang/Object;
-Ljava/util/Collections$SynchronizedList;->serialVersionUID:J
-Ljava/util/Collections$SynchronizedMap;->m:Ljava/util/Map;
-Ljava/util/Collections$SynchronizedMap;->serialVersionUID:J
-Ljava/util/Collections$SynchronizedMap;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/Collections$SynchronizedNavigableMap;->serialVersionUID:J
-Ljava/util/Collections$SynchronizedNavigableSet;->serialVersionUID:J
-Ljava/util/Collections$SynchronizedRandomAccessList;->serialVersionUID:J
-Ljava/util/Collections$SynchronizedRandomAccessList;->writeReplace()Ljava/lang/Object;
-Ljava/util/Collections$SynchronizedSet;->serialVersionUID:J
-Ljava/util/Collections$SynchronizedSortedMap;->serialVersionUID:J
-Ljava/util/Collections$SynchronizedSortedSet;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableCollection;->c:Ljava/util/Collection;
-Ljava/util/Collections$UnmodifiableCollection;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableList;->readResolve()Ljava/lang/Object;
-Ljava/util/Collections$UnmodifiableList;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableMap$UnmodifiableEntrySet;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableMap;->m:Ljava/util/Map;
-Ljava/util/Collections$UnmodifiableMap;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableNavigableMap$EmptyNavigableMap;->readResolve()Ljava/lang/Object;
-Ljava/util/Collections$UnmodifiableNavigableMap$EmptyNavigableMap;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableNavigableMap;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableNavigableSet$EmptyNavigableSet;->readResolve()Ljava/lang/Object;
-Ljava/util/Collections$UnmodifiableNavigableSet$EmptyNavigableSet;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableNavigableSet;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableRandomAccessList;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableRandomAccessList;->writeReplace()Ljava/lang/Object;
-Ljava/util/Collections$UnmodifiableSet;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableSortedMap;->serialVersionUID:J
-Ljava/util/Collections$UnmodifiableSortedSet;->serialVersionUID:J
-Ljava/util/ConcurrentModificationException;->serialVersionUID:J
-Ljava/util/Currency;->readResolve()Ljava/lang/Object;
-Ljava/util/Currency;->serialVersionUID:J
-Ljava/util/Date;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/Date;->serialVersionUID:J
-Ljava/util/Date;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/DuplicateFormatFlagsException;->serialVersionUID:J
-Ljava/util/EmptyStackException;->serialVersionUID:J
-Ljava/util/EnumMap;->keyType:Ljava/lang/Class;
-Ljava/util/EnumMap;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/EnumMap;->serialVersionUID:J
-Ljava/util/EnumMap;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/EnumSet$SerializationProxy;->readResolve()Ljava/lang/Object;
-Ljava/util/EnumSet$SerializationProxy;->serialVersionUID:J
-Ljava/util/EnumSet;->elementType:Ljava/lang/Class;
-Ljava/util/EnumSet;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/EnumSet;->writeReplace()Ljava/lang/Object;
-Ljava/util/EventObject;->serialVersionUID:J
-Ljava/util/FormatFlagsConversionMismatchException;->serialVersionUID:J
-Ljava/util/FormatterClosedException;->serialVersionUID:J
-Ljava/util/GregorianCalendar;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/GregorianCalendar;->serialVersionUID:J
-Ljava/util/HashMap$HashIterator;->hasNext()Z
-Ljava/util/HashMap;->modCount:I
-Ljava/util/HashMap;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/HashMap;->serialVersionUID:J
-Ljava/util/HashMap;->table:[Ljava/util/HashMap$Node;
-Ljava/util/HashMap;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/HashSet;->map:Ljava/util/HashMap;
-Ljava/util/HashSet;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/HashSet;->serialVersionUID:J
-Ljava/util/HashSet;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/Hashtable;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/Hashtable;->serialVersionUID:J
-Ljava/util/Hashtable;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/IdentityHashMap;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/IdentityHashMap;->serialVersionUID:J
-Ljava/util/IdentityHashMap;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/IllegalFormatCodePointException;->serialVersionUID:J
-Ljava/util/IllegalFormatConversionException;->serialVersionUID:J
-Ljava/util/IllegalFormatException;->serialVersionUID:J
-Ljava/util/IllegalFormatFlagsException;->serialVersionUID:J
-Ljava/util/IllegalFormatPrecisionException;->serialVersionUID:J
-Ljava/util/IllegalFormatWidthException;->serialVersionUID:J
-Ljava/util/IllformedLocaleException;->serialVersionUID:J
-Ljava/util/InputMismatchException;->serialVersionUID:J
-Ljava/util/InvalidPropertiesFormatException;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/InvalidPropertiesFormatException;->serialVersionUID:J
-Ljava/util/InvalidPropertiesFormatException;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/LinkedHashMap$LinkedHashIterator;->hasNext()Z
-Ljava/util/LinkedHashMap;->eldest()Ljava/util/Map$Entry;
-Ljava/util/LinkedHashMap;->serialVersionUID:J
-Ljava/util/LinkedHashSet;->serialVersionUID:J
-Ljava/util/LinkedList;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/LinkedList;->serialVersionUID:J
-Ljava/util/LinkedList;->size:I
-Ljava/util/LinkedList;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/Locale;->createConstant(Ljava/lang/String;Ljava/lang/String;)Ljava/util/Locale;
-Ljava/util/Locale;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/Locale;->readResolve()Ljava/lang/Object;
-Ljava/util/Locale;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/util/Locale;->serialVersionUID:J
-Ljava/util/Locale;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/MissingFormatArgumentException;->serialVersionUID:J
-Ljava/util/MissingFormatWidthException;->serialVersionUID:J
-Ljava/util/MissingResourceException;->serialVersionUID:J
-Ljava/util/NoSuchElementException;->serialVersionUID:J
-Ljava/util/PriorityQueue;->modCount:I
-Ljava/util/PriorityQueue;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/PriorityQueue;->serialVersionUID:J
-Ljava/util/PriorityQueue;->size:I
-Ljava/util/PriorityQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/Properties;->serialVersionUID:J
-Ljava/util/Random;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/Random;->seedUniquifier()J
-Ljava/util/Random;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/util/Random;->serialVersionUID:J
-Ljava/util/Random;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/ServiceConfigurationError;->serialVersionUID:J
-Ljava/util/SimpleTimeZone;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/SimpleTimeZone;->serialVersionUID:J
-Ljava/util/SimpleTimeZone;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/Stack;->serialVersionUID:J
-Ljava/util/TimeZone;->serialVersionUID:J
-Ljava/util/TooManyListenersException;->serialVersionUID:J
-Ljava/util/TreeMap$AscendingSubMap;->serialVersionUID:J
-Ljava/util/TreeMap$DescendingSubMap;->serialVersionUID:J
-Ljava/util/TreeMap$NavigableSubMap;->serialVersionUID:J
-Ljava/util/TreeMap$SubMap;->readResolve()Ljava/lang/Object;
-Ljava/util/TreeMap$SubMap;->serialVersionUID:J
-Ljava/util/TreeMap;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/TreeMap;->serialVersionUID:J
-Ljava/util/TreeMap;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/TreeSet;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/TreeSet;->serialVersionUID:J
-Ljava/util/TreeSet;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/UUID;->leastSigBits:J
-Ljava/util/UUID;->mostSigBits:J
-Ljava/util/UUID;->serialVersionUID:J
-Ljava/util/UnknownFormatConversionException;->serialVersionUID:J
-Ljava/util/UnknownFormatFlagsException;->serialVersionUID:J
-Ljava/util/Vector;->elementData(I)Ljava/lang/Object;
-Ljava/util/Vector;->serialVersionUID:J
-Ljava/util/Vector;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/ArrayBlockingQueue;->serialVersionUID:J
-Ljava/util/concurrent/BrokenBarrierException;->serialVersionUID:J
-Ljava/util/concurrent/CancellationException;->serialVersionUID:J
-Ljava/util/concurrent/CompletionException;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentHashMap$BaseIterator;->hasMoreElements()Z
-Ljava/util/concurrent/ConcurrentHashMap$CollectionView;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentHashMap$EntrySetView;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentHashMap$KeySetView;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentHashMap$Segment;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentHashMap$ValuesView;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentHashMap;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/ConcurrentHashMap;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/util/concurrent/ConcurrentHashMap;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentHashMap;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/ConcurrentLinkedDeque;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/ConcurrentLinkedDeque;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentLinkedDeque;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/ConcurrentLinkedQueue;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/ConcurrentLinkedQueue;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentLinkedQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/ConcurrentSkipListMap$SubMap;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentSkipListMap;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/ConcurrentSkipListMap;->serialVersionUID:J
-Ljava/util/concurrent/ConcurrentSkipListMap;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/ConcurrentSkipListSet;->serialVersionUID:J
-Ljava/util/concurrent/CopyOnWriteArrayList;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/CopyOnWriteArrayList;->serialVersionUID:J
-Ljava/util/concurrent/CopyOnWriteArrayList;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/CopyOnWriteArraySet;->al:Ljava/util/concurrent/CopyOnWriteArrayList;
-Ljava/util/concurrent/CopyOnWriteArraySet;->serialVersionUID:J
-Ljava/util/concurrent/CountDownLatch$Sync;->serialVersionUID:J
-Ljava/util/concurrent/CountedCompleter;->serialVersionUID:J
-Ljava/util/concurrent/ExecutionException;->serialVersionUID:J
-Ljava/util/concurrent/Executors$RunnableAdapter;->task:Ljava/lang/Runnable;
-Ljava/util/concurrent/ForkJoinPool$AuxState;->serialVersionUID:J
-Ljava/util/concurrent/ForkJoinPool$EmptyTask;->serialVersionUID:J
-Ljava/util/concurrent/ForkJoinTask$AdaptedCallable;->serialVersionUID:J
-Ljava/util/concurrent/ForkJoinTask$AdaptedRunnable;->serialVersionUID:J
-Ljava/util/concurrent/ForkJoinTask$AdaptedRunnableAction;->serialVersionUID:J
-Ljava/util/concurrent/ForkJoinTask$RunnableExecuteAction;->serialVersionUID:J
-Ljava/util/concurrent/ForkJoinTask;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/ForkJoinTask;->serialVersionUID:J
-Ljava/util/concurrent/ForkJoinTask;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/FutureTask;->EXCEPTIONAL:I
-Ljava/util/concurrent/FutureTask;->callable:Ljava/util/concurrent/Callable;
-Ljava/util/concurrent/FutureTask;->outcome:Ljava/lang/Object;
-Ljava/util/concurrent/FutureTask;->state:I
-Ljava/util/concurrent/LinkedBlockingDeque;->first:Ljava/util/concurrent/LinkedBlockingDeque$Node;
-Ljava/util/concurrent/LinkedBlockingDeque;->lock:Ljava/util/concurrent/locks/ReentrantLock;
-Ljava/util/concurrent/LinkedBlockingDeque;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/LinkedBlockingDeque;->serialVersionUID:J
-Ljava/util/concurrent/LinkedBlockingDeque;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/LinkedBlockingQueue;->capacity:I
-Ljava/util/concurrent/LinkedBlockingQueue;->head:Ljava/util/concurrent/LinkedBlockingQueue$Node;
-Ljava/util/concurrent/LinkedBlockingQueue;->putLock:Ljava/util/concurrent/locks/ReentrantLock;
-Ljava/util/concurrent/LinkedBlockingQueue;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/LinkedBlockingQueue;->serialVersionUID:J
-Ljava/util/concurrent/LinkedBlockingQueue;->takeLock:Ljava/util/concurrent/locks/ReentrantLock;
-Ljava/util/concurrent/LinkedBlockingQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/LinkedTransferQueue$Node;->serialVersionUID:J
-Ljava/util/concurrent/LinkedTransferQueue;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/LinkedTransferQueue;->serialVersionUID:J
-Ljava/util/concurrent/LinkedTransferQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/PriorityBlockingQueue;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/PriorityBlockingQueue;->serialVersionUID:J
-Ljava/util/concurrent/PriorityBlockingQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/RecursiveAction;->serialVersionUID:J
-Ljava/util/concurrent/RecursiveTask;->serialVersionUID:J
-Ljava/util/concurrent/RejectedExecutionException;->serialVersionUID:J
-Ljava/util/concurrent/Semaphore$FairSync;->serialVersionUID:J
-Ljava/util/concurrent/Semaphore$NonfairSync;->serialVersionUID:J
-Ljava/util/concurrent/Semaphore$Sync;->serialVersionUID:J
-Ljava/util/concurrent/Semaphore;->serialVersionUID:J
-Ljava/util/concurrent/SynchronousQueue$FifoWaitQueue;->serialVersionUID:J
-Ljava/util/concurrent/SynchronousQueue$LifoWaitQueue;->serialVersionUID:J
-Ljava/util/concurrent/SynchronousQueue;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/SynchronousQueue;->serialVersionUID:J
-Ljava/util/concurrent/SynchronousQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/ThreadLocalRandom;->readResolve()Ljava/lang/Object;
-Ljava/util/concurrent/ThreadLocalRandom;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljava/util/concurrent/ThreadLocalRandom;->serialVersionUID:J
-Ljava/util/concurrent/ThreadLocalRandom;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/concurrent/ThreadPoolExecutor$Worker;->serialVersionUID:J
-Ljava/util/concurrent/ThreadPoolExecutor;->allowCoreThreadTimeOut:Z
-Ljava/util/concurrent/TimeoutException;->serialVersionUID:J
-Ljava/util/concurrent/atomic/AtomicBoolean;->serialVersionUID:J
-Ljava/util/concurrent/atomic/AtomicInteger;->serialVersionUID:J
-Ljava/util/concurrent/atomic/AtomicInteger;->value:I
-Ljava/util/concurrent/atomic/AtomicIntegerArray;->serialVersionUID:J
-Ljava/util/concurrent/atomic/AtomicLong;->serialVersionUID:J
-Ljava/util/concurrent/atomic/AtomicLongArray;->serialVersionUID:J
-Ljava/util/concurrent/atomic/AtomicReference;->serialVersionUID:J
-Ljava/util/concurrent/atomic/AtomicReferenceArray;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/atomic/AtomicReferenceArray;->serialVersionUID:J
-Ljava/util/concurrent/atomic/DoubleAccumulator$SerializationProxy;->readResolve()Ljava/lang/Object;
-Ljava/util/concurrent/atomic/DoubleAccumulator$SerializationProxy;->serialVersionUID:J
-Ljava/util/concurrent/atomic/DoubleAccumulator;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/atomic/DoubleAccumulator;->serialVersionUID:J
-Ljava/util/concurrent/atomic/DoubleAccumulator;->writeReplace()Ljava/lang/Object;
-Ljava/util/concurrent/atomic/DoubleAdder$SerializationProxy;->readResolve()Ljava/lang/Object;
-Ljava/util/concurrent/atomic/DoubleAdder$SerializationProxy;->serialVersionUID:J
-Ljava/util/concurrent/atomic/DoubleAdder;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/atomic/DoubleAdder;->serialVersionUID:J
-Ljava/util/concurrent/atomic/DoubleAdder;->writeReplace()Ljava/lang/Object;
-Ljava/util/concurrent/atomic/LongAccumulator$SerializationProxy;->readResolve()Ljava/lang/Object;
-Ljava/util/concurrent/atomic/LongAccumulator$SerializationProxy;->serialVersionUID:J
-Ljava/util/concurrent/atomic/LongAccumulator;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/atomic/LongAccumulator;->serialVersionUID:J
-Ljava/util/concurrent/atomic/LongAccumulator;->writeReplace()Ljava/lang/Object;
-Ljava/util/concurrent/atomic/LongAdder$SerializationProxy;->readResolve()Ljava/lang/Object;
-Ljava/util/concurrent/atomic/LongAdder$SerializationProxy;->serialVersionUID:J
-Ljava/util/concurrent/atomic/LongAdder;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/atomic/LongAdder;->serialVersionUID:J
-Ljava/util/concurrent/atomic/LongAdder;->writeReplace()Ljava/lang/Object;
-Ljava/util/concurrent/locks/AbstractOwnableSynchronizer;->serialVersionUID:J
-Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;->serialVersionUID:J
-Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer;->serialVersionUID:J
-Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;->serialVersionUID:J
-Ljava/util/concurrent/locks/AbstractQueuedSynchronizer;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantLock$FairSync;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantLock$NonfairSync;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantLock$Sync;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/locks/ReentrantLock$Sync;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantLock;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantReadWriteLock$FairSync;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantReadWriteLock$NonfairSync;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantReadWriteLock$Sync;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/locks/ReentrantReadWriteLock$Sync;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->serialVersionUID:J
-Ljava/util/concurrent/locks/ReentrantReadWriteLock;->serialVersionUID:J
-Ljava/util/concurrent/locks/StampedLock;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/concurrent/locks/StampedLock;->serialVersionUID:J
-Ljava/util/jar/JarException;->serialVersionUID:J
-Ljava/util/jar/JarFile;->manifest:Ljava/util/jar/Manifest;
-Ljava/util/jar/JarVerifier$VerifierCodeSource;->serialVersionUID:J
-Ljava/util/logging/Level;->readResolve()Ljava/lang/Object;
-Ljava/util/logging/Level;->serialVersionUID:J
-Ljava/util/logging/LogRecord;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/logging/LogRecord;->serialVersionUID:J
-Ljava/util/logging/LogRecord;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/prefs/AbstractPreferences$NodeAddedEvent;->serialVersionUID:J
-Ljava/util/prefs/AbstractPreferences$NodeRemovedEvent;->serialVersionUID:J
-Ljava/util/prefs/BackingStoreException;->serialVersionUID:J
-Ljava/util/prefs/InvalidPreferencesFormatException;->serialVersionUID:J
-Ljava/util/prefs/NodeChangeEvent;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/prefs/NodeChangeEvent;->serialVersionUID:J
-Ljava/util/prefs/NodeChangeEvent;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/prefs/PreferenceChangeEvent;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/prefs/PreferenceChangeEvent;->serialVersionUID:J
-Ljava/util/prefs/PreferenceChangeEvent;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljava/util/regex/Matcher;->appendPos:I
-Ljava/util/regex/Pattern;->readObject(Ljava/io/ObjectInputStream;)V
-Ljava/util/regex/Pattern;->serialVersionUID:J
-Ljava/util/regex/PatternSyntaxException;->serialVersionUID:J
-Ljava/util/zip/DataFormatException;->serialVersionUID:J
-Ljava/util/zip/Deflater;->buf:[B
-Ljava/util/zip/Deflater;->finish:Z
-Ljava/util/zip/Deflater;->finished:Z
-Ljava/util/zip/Deflater;->len:I
-Ljava/util/zip/Deflater;->level:I
-Ljava/util/zip/Deflater;->off:I
-Ljava/util/zip/Deflater;->setParams:Z
-Ljava/util/zip/Deflater;->strategy:I
-Ljava/util/zip/Inflater;->buf:[B
-Ljava/util/zip/Inflater;->finished:Z
-Ljava/util/zip/Inflater;->len:I
-Ljava/util/zip/Inflater;->needDict:Z
-Ljava/util/zip/Inflater;->off:I
-Ljava/util/zip/ZipEntry;-><init>(Ljava/lang/String;Ljava/lang/String;JJJII[BJ)V
-Ljava/util/zip/ZipError;->serialVersionUID:J
-Ljava/util/zip/ZipException;->serialVersionUID:J
-Ljava/util/zip/ZipFile;->jzfile:J
-Ljavax/crypto/AEADBadTagException;->serialVersionUID:J
-Ljavax/crypto/BadPaddingException;->serialVersionUID:J
-Ljavax/crypto/ExemptionMechanismException;->serialVersionUID:J
-Ljavax/crypto/IllegalBlockSizeException;->serialVersionUID:J
-Ljavax/crypto/NoSuchPaddingException;->serialVersionUID:J
-Ljavax/crypto/SealedObject;->readObject(Ljava/io/ObjectInputStream;)V
-Ljavax/crypto/SealedObject;->serialVersionUID:J
-Ljavax/crypto/ShortBufferException;->serialVersionUID:J
-Ljavax/crypto/spec/SecretKeySpec;->serialVersionUID:J
-Ljavax/net/ssl/HandshakeCompletedEvent;->serialVersionUID:J
-Ljavax/net/ssl/SSLException;->serialVersionUID:J
-Ljavax/net/ssl/SSLHandshakeException;->serialVersionUID:J
-Ljavax/net/ssl/SSLKeyException;->serialVersionUID:J
-Ljavax/net/ssl/SSLPeerUnverifiedException;->serialVersionUID:J
-Ljavax/net/ssl/SSLProtocolException;->serialVersionUID:J
-Ljavax/net/ssl/SSLServerSocketFactory;->defaultServerSocketFactory:Ljavax/net/ssl/SSLServerSocketFactory;
-Ljavax/net/ssl/SSLSessionBindingEvent;->serialVersionUID:J
-Ljavax/net/ssl/SSLSocketFactory;->defaultSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
-Ljavax/security/auth/DestroyFailedException;->serialVersionUID:J
-Ljavax/security/auth/Subject$SecureSet;->readObject(Ljava/io/ObjectInputStream;)V
-Ljavax/security/auth/Subject$SecureSet;->serialPersistentFields:[Ljava/io/ObjectStreamField;
-Ljavax/security/auth/Subject$SecureSet;->serialVersionUID:J
-Ljavax/security/auth/Subject$SecureSet;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljavax/security/auth/Subject;->readObject(Ljava/io/ObjectInputStream;)V
-Ljavax/security/auth/Subject;->serialVersionUID:J
-Ljavax/security/auth/Subject;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljavax/security/auth/callback/PasswordCallback;->serialVersionUID:J
-Ljavax/security/auth/callback/UnsupportedCallbackException;->serialVersionUID:J
-Ljavax/security/auth/login/LoginException;->serialVersionUID:J
-Ljavax/security/auth/x500/X500Principal;->readObject(Ljava/io/ObjectInputStream;)V
-Ljavax/security/auth/x500/X500Principal;->serialVersionUID:J
-Ljavax/security/auth/x500/X500Principal;->writeObject(Ljava/io/ObjectOutputStream;)V
-Ljavax/security/cert/CertificateEncodingException;->serialVersionUID:J
-Ljavax/security/cert/CertificateException;->serialVersionUID:J
-Ljavax/security/cert/CertificateExpiredException;->serialVersionUID:J
-Ljavax/security/cert/CertificateNotYetValidException;->serialVersionUID:J
-Ljavax/security/cert/CertificateParsingException;->serialVersionUID:J
-Ljavax/sql/ConnectionEvent;->serialVersionUID:J
-Ljavax/sql/RowSetEvent;->serialVersionUID:J
-Ljavax/xml/datatype/DatatypeConfigurationException;->readObject(Ljava/io/ObjectInputStream;)V
-Ljavax/xml/datatype/DatatypeConfigurationException;->serialVersionUID:J
-Ljavax/xml/namespace/QName;->readObject(Ljava/io/ObjectInputStream;)V
-Ljavax/xml/namespace/QName;->serialVersionUID:J
-Ljavax/xml/transform/TransformerException;->serialVersionUID:J
-Ljavax/xml/xpath/XPathException;->serialVersionUID:J
-Ljavax/xml/xpath/XPathExpressionException;->serialVersionUID:J
-Ljavax/xml/xpath/XPathFactoryConfigurationException;->serialVersionUID:J
-Ljavax/xml/xpath/XPathFunctionException;->serialVersionUID:J
-Llibcore/util/BasicLruCache;->map:Ljava/util/LinkedHashMap;
-Llibcore/util/ZoneInfo;->mTransitions:[J
-Llibcore/util/ZoneInfo;->readObject(Ljava/io/ObjectInputStream;)V
-Llibcore/util/ZoneInfo;->serialVersionUID:J
-Lorg/apache/http/conn/ConnectTimeoutException;->serialVersionUID:J
-Lorg/apache/http/conn/ssl/SSLSocketFactory;-><init>()V
-Lorg/apache/http/conn/ssl/SSLSocketFactory;-><init>(Ljavax/net/ssl/SSLSocketFactory;)V
-Lorg/ccil/cowan/tagsoup/AttributesImpl;->data:[Ljava/lang/String;
-Lorg/ccil/cowan/tagsoup/AttributesImpl;->length:I
-Lorg/json/JSONArray;->values:Ljava/util/List;
-Lorg/json/JSONObject;->append(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
-Lorg/json/JSONObject;->keySet()Ljava/util/Set;
-Lorg/json/JSONObject;->writeTo(Lorg/json/JSONStringer;)V
-Lorg/w3c/dom/traversal/NodeIterator;->nextNode()Lorg/w3c/dom/Node;
-Lsun/misc/Unsafe;->theUnsafe:Lsun/misc/Unsafe;
-Lsun/security/pkcs/ParsingException;->serialVersionUID:J
-Lsun/security/util/ObjectIdentifier$HugeOidNotSupportedByOldJDK;->serialVersionUID:J
-Lsun/security/util/ObjectIdentifier;->readObject(Ljava/io/ObjectInputStream;)V
-Lsun/security/util/ObjectIdentifier;->serialVersionUID:J
-Lsun/security/util/ObjectIdentifier;->writeObject(Ljava/io/ObjectOutputStream;)V
-Lsun/security/x509/AlgorithmId;->serialVersionUID:J
-Lsun/util/locale/LocaleSyntaxException;->serialVersionUID:J
diff --git a/config/hiddenapi-vendor-list.txt b/config/hiddenapi-vendor-list.txt
index 9e6abe4..02719e3f8 100644
--- a/config/hiddenapi-vendor-list.txt
+++ b/config/hiddenapi-vendor-list.txt
@@ -113,14 +113,7 @@
 Landroid/os/RegistrantList;->removeCleared()V
 Landroid/os/RemoteException;->rethrowFromSystemServer()Ljava/lang/RuntimeException;
 Landroid/os/ServiceSpecificException;->errorCode:I
-Landroid/os/storage/DiskInfo;->getId()Ljava/lang/String;
 Landroid/os/storage/StorageEventListener;-><init>()V
-Landroid/os/storage/StorageManager;->findVolumeById(Ljava/lang/String;)Landroid/os/storage/VolumeInfo;
-Landroid/os/storage/StorageManager;->from(Landroid/content/Context;)Landroid/os/storage/StorageManager;
-Landroid/os/storage/StorageManager;->registerListener(Landroid/os/storage/StorageEventListener;)V
-Landroid/os/storage/StorageManager;->unregisterListener(Landroid/os/storage/StorageEventListener;)V
-Landroid/os/storage/StorageVolume;->getId()Ljava/lang/String;
-Landroid/os/storage/VolumeInfo;->getId()Ljava/lang/String;
 Landroid/os/SystemProperties;->reportSyspropChanged()V
 Landroid/os/SystemService;->start(Ljava/lang/String;)V
 Landroid/os/SystemService;->stop(Ljava/lang/String;)V
@@ -260,17 +253,7 @@
 Lcom/android/internal/location/ILocationProvider;->setRequest(Lcom/android/internal/location/ProviderRequest;Landroid/os/WorkSource;)V
 Lcom/android/internal/R$styleable;->NumberPicker:[I
 Lcom/android/internal/R$styleable;->TwoLineListItem:[I
-Lcom/android/internal/telephony/GsmAlphabet;->gsm7BitPackedToString([BII)Ljava/lang/String;
-Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm7BitPacked(Ljava/lang/String;)[B
 Lcom/android/internal/telephony/ITelephony;->getDataEnabled(I)Z
-Lcom/android/internal/telephony/OperatorInfo$State;->CURRENT:Lcom/android/internal/telephony/OperatorInfo$State;
-Lcom/android/internal/telephony/OperatorInfo$State;->FORBIDDEN:Lcom/android/internal/telephony/OperatorInfo$State;
-Lcom/android/internal/telephony/OperatorInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-Lcom/android/internal/telephony/OperatorInfo;->CREATOR:Landroid/os/Parcelable$Creator;
-Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaLong()Ljava/lang/String;
-Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaShort()Ljava/lang/String;
-Lcom/android/internal/telephony/OperatorInfo;->getOperatorNumeric()Ljava/lang/String;
-Lcom/android/internal/telephony/OperatorInfo;->getState()Lcom/android/internal/telephony/OperatorInfo$State;
 Ljava/lang/System;->arraycopy([BI[BII)V
 Ljava/net/Inet4Address;->ALL:Ljava/net/InetAddress;
 Ljava/net/Inet4Address;->ANY:Ljava/net/InetAddress;
diff --git a/core/java/android/annotation/OWNERS b/core/java/android/annotation/OWNERS
index d6bb71b..85adfa7 100644
--- a/core/java/android/annotation/OWNERS
+++ b/core/java/android/annotation/OWNERS
@@ -1 +1,2 @@
 tnorbye@google.com
+per-file UnsupportedAppUsage.java = mathewi@google.com
diff --git a/core/java/android/annotation/UnsupportedAppUsage.java b/core/java/android/annotation/UnsupportedAppUsage.java
index fbba6da..28145a0 100644
--- a/core/java/android/annotation/UnsupportedAppUsage.java
+++ b/core/java/android/annotation/UnsupportedAppUsage.java
@@ -27,15 +27,15 @@
  * Indicates that a class member, that is not part of the SDK, is used by apps.
  * Since the member is not part of the SDK, such use is not supported.
  *
- * This annotation acts as a heads up that changing a given method or field
+ * <p>This annotation acts as a heads up that changing a given method or field
  * may affect apps, potentially breaking them when the next Android version is
  * released. In some cases, for members that are heavily used, this annotation
  * may imply restrictions on changes to the member.
  *
- * This annotation also results in access to the member being permitted by the
+ * <p>This annotation also results in access to the member being permitted by the
  * runtime, with a warning being generated in debug builds.
  *
- * For more details, see go/UnsupportedAppUsage.
+ * <p>For more details, see go/UnsupportedAppUsage.
  *
  * {@hide}
  */
@@ -53,15 +53,15 @@
     /**
      * Indicates that usage of this API is limited to apps based on their target SDK version.
      *
-     * Access to the API is allowed if the targetSdkVersion in the apps manifest is no greater than
-     * this value. Access checks are performed at runtime.
+     * <p>Access to the API is allowed if the targetSdkVersion in the apps manifest is no greater
+     * than this value. Access checks are performed at runtime.
      *
-     * This is used to give app developers a grace period to migrate off a non-SDK interface. When
-     * making Android version N, existing APIs can have a maxTargetSdk of N-1 added to them.
+     * <p>This is used to give app developers a grace period to migrate off a non-SDK interface.
+     * When making Android version N, existing APIs can have a maxTargetSdk of N-1 added to them.
      * Developers must then migrate off the API when their app is updated in future, but it will
      * continue working in the meantime.
      *
-     * Possible values are:
+     * <p>Possible values are:
      * <ul>
      *     <li>
      *         {@link android.os.Build.VERSION_CODES#O} or {@link android.os.Build.VERSION_CODES#P},
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 8d5b96b..bf2d860 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1349,7 +1349,12 @@
      * to give the activity a hint that its state is no longer saved -- it will generally
      * be called after {@link #onSaveInstanceState} and prior to the activity being
      * resumed/started again.
+     *
+     * @deprecated starting with {@link android.os.Build.VERSION_CODES#P} onSaveInstanceState is
+     * called after {@link #onStop}, so this hint isn't accurate anymore: you should consider your
+     * state not saved in between {@code onStart} and {@code onStop} callbacks inclusively.
      */
+    @Deprecated
     public void onStateNotSaved() {
     }
 
@@ -4744,7 +4749,7 @@
     /**
      * @hide Implement to provide correct calling token.
      */
-    @UnsupportedAppUsage
+    @Override
     public void startActivityAsUser(Intent intent, UserHandle user) {
         startActivityAsUser(intent, null, user);
     }
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index c12d8e2..8354235 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -2747,6 +2747,7 @@
          *
          * @hide
          */
+        @TestApi
         public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170;
 
         /**
@@ -3266,6 +3267,13 @@
      * <p><b>Note: this method is only intended for debugging or building
      * a user-facing process management UI.</b></p>
      *
+     * <p>As of {@link android.os.Build.VERSION_CODES#Q Android Q}, for regular apps this method
+     * will only return information about the memory info for the processes running as the
+     * caller's uid; no other process memory info is available and will be zero.
+     * Also of {@link android.os.Build.VERSION_CODES#Q Android Q} the sample rate allowed
+     * by this API is significantly limited, if called faster the limit you will receive the
+     * same data as the previous call.</p>
+     *
      * @param pids The pids of the processes whose memory usage is to be
      * retrieved.
      * @return Returns an array of memory information, one for each
diff --git a/core/java/android/app/IBackupAgent.aidl b/core/java/android/app/IBackupAgent.aidl
index 4517446..d3d7c68 100644
--- a/core/java/android/app/IBackupAgent.aidl
+++ b/core/java/android/app/IBackupAgent.aidl
@@ -48,8 +48,7 @@
      *        be echoed back to the backup service binder once the new
      *        data has been written to the data and newState files.
      *
-     * @param callbackBinder Binder on which to indicate operation completion,
-     *        passed here as a convenience to the agent.
+     * @param callbackBinder Binder on which to indicate operation completion.
      *
      * @param transportFlags Flags with additional information about the transport.
      */
@@ -133,8 +132,9 @@
      *                        Could be less than total backup size if backup process was interrupted
      *                        before finish of processing all backup data.
      * @param quotaBytes Current amount of backup data that is allowed for the app.
+     * @param callbackBinder Binder on which to indicate operation completion.
      */
-    void doQuotaExceeded(long backupDataBytes, long quotaBytes);
+    void doQuotaExceeded(long backupDataBytes, long quotaBytes, IBackupCallback callbackBinder);
 
     /**
      * Restore a single "file" to the application.  The file was typically obtained from
diff --git a/core/java/android/app/IInstantAppResolver.aidl b/core/java/android/app/IInstantAppResolver.aidl
index ae20057..7318762 100644
--- a/core/java/android/app/IInstantAppResolver.aidl
+++ b/core/java/android/app/IInstantAppResolver.aidl
@@ -22,9 +22,9 @@
 /** @hide */
 oneway interface IInstantAppResolver {
     void getInstantAppResolveInfoList(in Intent sanitizedIntent, in int[] hostDigestPrefix,
-            String token, int sequence, IRemoteCallback callback);
+            int userId, String token, int sequence, IRemoteCallback callback);
 
     void getInstantAppIntentFilterList(in Intent sanitizedIntent, in int[] hostDigestPrefix,
-            String token, IRemoteCallback callback);
+            int userId, String token, IRemoteCallback callback);
 
 }
diff --git a/core/java/android/app/InstantAppResolverService.java b/core/java/android/app/InstantAppResolverService.java
index 58d0aaf..8f83ee3 100644
--- a/core/java/android/app/InstantAppResolverService.java
+++ b/core/java/android/app/InstantAppResolverService.java
@@ -28,6 +28,7 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.util.Log;
 import android.util.Slog;
 
@@ -56,8 +57,8 @@
      * Called to retrieve resolve info for instant applications immediately.
      *
      * @param digestPrefix The hash prefix of the instant app's domain.
-     * @deprecated should implement {@link #onGetInstantAppResolveInfo(Intent, int[], String,
-     *             InstantAppResolutionCallback)}
+     * @deprecated Should implement {@link #onGetInstantAppResolveInfo(Intent, int[], UserHandle,
+     *             String, InstantAppResolutionCallback)}.
      */
     @Deprecated
     public void onGetInstantAppResolveInfo(
@@ -70,8 +71,8 @@
      * sources.
      *
      * @param digestPrefix The hash prefix of the instant app's domain.
-     * @deprecated should implement {@link #onGetInstantAppIntentFilter(Intent, int[], String,
-     *             InstantAppResolutionCallback)}
+     * @deprecated Should implement {@link #onGetInstantAppIntentFilter(Intent, int[], UserHandle,
+     *             String, InstantAppResolutionCallback)}.
      */
     @Deprecated
     public void onGetInstantAppIntentFilter(
@@ -86,7 +87,6 @@
      * result in a subsequent call to
      * {@link #onGetInstantAppIntentFilter(Intent, int[], String, InstantAppResolutionCallback)}
      *
-     *
      * @param sanitizedIntent The sanitized {@link Intent} used for resolution. A sanitized Intent
      *                        is an intent with potential PII removed from the original intent.
      *                        Fields removed include extras and the host + path of the data, if
@@ -100,7 +100,11 @@
      * @param callback The {@link InstantAppResolutionCallback} to provide results to.
      *
      * @see InstantAppResolveInfo
+     *
+     * @deprecated Should implement {@link #onGetInstantAppResolveInfo(Intent, int[], UserHandle,
+     *             String, InstantAppResolutionCallback)}.
      */
+    @Deprecated
     public void onGetInstantAppResolveInfo(Intent sanitizedIntent, int[] hostDigestPrefix,
             String token, InstantAppResolutionCallback callback) {
         // if not overridden, forward to old methods and filter out non-web intents
@@ -125,8 +129,12 @@
      *              InstantAppResolutionCallback)}
      *              and provided to the currently visible installer via
      *              {@link Intent#EXTRA_INSTANT_APP_TOKEN}.
-     * @param callback The {@link InstantAppResolutionCallback} to provide results to
+     * @param callback The {@link InstantAppResolutionCallback} to provide results to.
+     *
+     * @deprecated Should implement {@link #onGetInstantAppIntentFilter(Intent, int[], UserHandle,
+     *             String, InstantAppResolutionCallback)}.
      */
+    @Deprecated
     public void onGetInstantAppIntentFilter(Intent sanitizedIntent, int[] hostDigestPrefix,
             String token, InstantAppResolutionCallback callback) {
         Log.e(TAG, "New onGetInstantAppIntentFilter is not overridden");
@@ -139,6 +147,55 @@
     }
 
     /**
+     * Called to retrieve resolve info for instant applications immediately. The response will be
+     * ignored if not provided within a reasonable time. {@link InstantAppResolveInfo}s provided
+     * in response to this method may be partial to request a second phase of resolution which will
+     * result in a subsequent call to {@link #onGetInstantAppIntentFilter(Intent, int[], UserHandle,
+     * String, InstantAppResolutionCallback)}
+     *
+     * @param sanitizedIntent The sanitized {@link Intent} used for resolution. A sanitized Intent
+     *                        is an intent with potential PII removed from the original intent.
+     *                        Fields removed include extras and the host + path of the data, if
+     *                        defined.
+     * @param hostDigestPrefix The hash prefix of the instant app's domain.
+     * @param userHandle The user for which to resolve the instant app.
+     * @param token A unique identifier that will be provided in calls to {@link
+     *              #onGetInstantAppIntentFilter(Intent, int[], UserHandle, String,
+     *              InstantAppResolutionCallback)} and provided to the installer via {@link
+     *              Intent#EXTRA_INSTANT_APP_TOKEN} to tie a single launch together.
+     * @param callback The {@link InstantAppResolutionCallback} to provide results to.
+     *
+     * @see InstantAppResolveInfo
+     */
+    public void onGetInstantAppResolveInfo(Intent sanitizedIntent, int[] hostDigestPrefix,
+            UserHandle userHandle, String token, InstantAppResolutionCallback callback) {
+        // If not overridden, forward to the old method.
+        onGetInstantAppResolveInfo(sanitizedIntent, hostDigestPrefix, token, callback);
+    }
+
+    /**
+     * Called to retrieve intent filters for potentially matching instant applications. Unlike
+     * {@link #onGetInstantAppResolveInfo(Intent, int[], UserHandle, String,
+     * InstantAppResolutionCallback)}, the response may take as long as necessary to respond. All
+     * {@link InstantAppResolveInfo}s provided in response to this method must be completely
+     * populated.
+     *
+     * @param sanitizedIntent The sanitized {@link Intent} used for resolution.
+     * @param hostDigestPrefix The hash prefix of the instant app's domain or null if no host is
+     *                         defined.
+     * @param userHandle The user for which to resolve the instant app.
+     * @param token A unique identifier that was provided in {@link #onGetInstantAppResolveInfo(
+     *              Intent, int[], UserHandle, String, InstantAppResolutionCallback)} and provided
+     *              to the currently visible installer via {@link Intent#EXTRA_INSTANT_APP_TOKEN}.
+     * @param callback The {@link InstantAppResolutionCallback} to provide results to.
+     */
+    public void onGetInstantAppIntentFilter(Intent sanitizedIntent, int[] hostDigestPrefix,
+            UserHandle userHandle, String token, InstantAppResolutionCallback callback) {
+        // If not overridden, forward to the old method.
+        onGetInstantAppIntentFilter(sanitizedIntent, hostDigestPrefix, token, callback);
+    }
+
+    /**
      * Returns a {@link Looper} to perform service operations on.
      */
     Looper getLooper() {
@@ -156,30 +213,32 @@
         return new IInstantAppResolver.Stub() {
             @Override
             public void getInstantAppResolveInfoList(Intent sanitizedIntent, int[] digestPrefix,
-                    String token, int sequence, IRemoteCallback callback) {
+                    int userId, String token, int sequence, IRemoteCallback callback) {
                 if (DEBUG_INSTANT) {
                     Slog.v(TAG, "[" + token + "] Phase1 called; posting");
                 }
                 final SomeArgs args = SomeArgs.obtain();
                 args.arg1 = callback;
                 args.arg2 = digestPrefix;
-                args.arg3 = token;
-                args.arg4 = sanitizedIntent;
+                args.arg3 = userId;
+                args.arg4 = token;
+                args.arg5 = sanitizedIntent;
                 mHandler.obtainMessage(ServiceHandler.MSG_GET_INSTANT_APP_RESOLVE_INFO,
                         sequence, 0, args).sendToTarget();
             }
 
             @Override
             public void getInstantAppIntentFilterList(Intent sanitizedIntent,
-                    int[] digestPrefix, String token, IRemoteCallback callback) {
+                    int[] digestPrefix, int userId, String token, IRemoteCallback callback) {
                 if (DEBUG_INSTANT) {
                     Slog.v(TAG, "[" + token + "] Phase2 called; posting");
                 }
                 final SomeArgs args = SomeArgs.obtain();
                 args.arg1 = callback;
                 args.arg2 = digestPrefix;
-                args.arg3 = token;
-                args.arg4 = sanitizedIntent;
+                args.arg3 = userId;
+                args.arg4 = token;
+                args.arg5 = sanitizedIntent;
                 mHandler.obtainMessage(ServiceHandler.MSG_GET_INSTANT_APP_INTENT_FILTER,
                         callback).sendToTarget();
             }
@@ -224,14 +283,16 @@
                     final SomeArgs args = (SomeArgs) message.obj;
                     final IRemoteCallback callback = (IRemoteCallback) args.arg1;
                     final int[] digestPrefix = (int[]) args.arg2;
-                    final String token = (String) args.arg3;
-                    final Intent intent = (Intent) args.arg4;
+                    final int userId = (int) args.arg3;
+                    final String token = (String) args.arg4;
+                    final Intent intent = (Intent) args.arg5;
                     final int sequence = message.arg1;
                     if (DEBUG_INSTANT) {
                         Slog.d(TAG, "[" + token + "] Phase1 request;"
-                                + " prefix: " + Arrays.toString(digestPrefix));
+                                + " prefix: " + Arrays.toString(digestPrefix)
+                                + ", userId: " + userId);
                     }
-                    onGetInstantAppResolveInfo(intent, digestPrefix, token,
+                    onGetInstantAppResolveInfo(intent, digestPrefix, UserHandle.of(userId), token,
                             new InstantAppResolutionCallback(sequence, callback));
                 } break;
 
@@ -239,13 +300,15 @@
                     final SomeArgs args = (SomeArgs) message.obj;
                     final IRemoteCallback callback = (IRemoteCallback) args.arg1;
                     final int[] digestPrefix = (int[]) args.arg2;
-                    final String token = (String) args.arg3;
-                    final Intent intent = (Intent) args.arg4;
+                    final int userId = (int) args.arg3;
+                    final String token = (String) args.arg4;
+                    final Intent intent = (Intent) args.arg5;
                     if (DEBUG_INSTANT) {
                         Slog.d(TAG, "[" + token + "] Phase2 request;"
-                                + " prefix: " + Arrays.toString(digestPrefix));
+                                + " prefix: " + Arrays.toString(digestPrefix)
+                                + ", userId: " + userId);
                     }
-                    onGetInstantAppIntentFilter(intent, digestPrefix, token,
+                    onGetInstantAppIntentFilter(intent, digestPrefix, UserHandle.of(userId), token,
                             new InstantAppResolutionCallback(-1 /*sequence*/, callback));
                 } break;
 
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
new file mode 100644
index 0000000..78ec8a1
--- /dev/null
+++ b/core/java/android/app/TEST_MAPPING
@@ -0,0 +1,10 @@
+{
+  "imports": [
+    {
+      "path": "frameworks/base/services/core/java/com/android/server/am"
+    },
+    {
+      "path": "frameworks/base/services/core/java/com/android/server/wm"
+    }
+  ]
+}
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index aa021a2..d1ecf1e 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -1205,7 +1205,7 @@
      * @see #createAdminSupportIntent(String)
      * @hide
      */
-    @TestApi
+    @TestApi @SystemApi
     public static final String EXTRA_RESTRICTION = "android.app.extra.RESTRICTION";
 
     /**
@@ -3896,6 +3896,11 @@
 
     /**
      * Installs the given certificate as a user CA.
+     * <p>
+     * Inserted user CAs aren't automatically trusted by apps in Android 7.0 (API level 24) and
+     * higher. App developers can change the default behavior for an app by adding a
+     * <a href="{@docRoot}training/articles/security-config.html">Security Configuration
+     * File</a> to the app manifest file.
      *
      * The caller must be a profile or device owner on that user, or a delegate package given the
      * {@link #DELEGATION_CERT_INSTALL} scope via {@link #setDelegatedScopes}; otherwise a
@@ -5137,10 +5142,10 @@
      * @return ID of the user who runs device owner, or {@link UserHandle#USER_NULL} if there's
      * no device owner.
      *
-     * <p>Requires the MANAGE_USERS permission.
-     *
      * @hide
      */
+    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)
+    @SystemApi
     public int getDeviceOwnerUserId() {
         if (mService != null) {
             try {
@@ -5560,12 +5565,13 @@
      * @see #getProfileOwner()
      * @hide
      */
-    @UnsupportedAppUsage
-    public @Nullable ComponentName getProfileOwnerAsUser(final int userId)
-            throws IllegalArgumentException {
+    @RequiresPermission(value = android.Manifest.permission.INTERACT_ACROSS_USERS,
+            conditional = true)
+    @SystemApi
+    public @Nullable ComponentName getProfileOwnerAsUser(final int userId) {
         if (mService != null) {
             try {
-                return mService.getProfileOwner(userId);
+                return mService.getProfileOwnerAsUser(userId);
             } catch (RemoteException re) {
                 throw re.rethrowFromSystemServer();
             }
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index c95bc5b..6a5f3de 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -145,6 +145,7 @@
     int getDeviceOwnerUserId();
 
     boolean setProfileOwner(in ComponentName who, String ownerName, int userHandle);
+    ComponentName getProfileOwnerAsUser(int userHandle);
     ComponentName getProfileOwner(int userHandle);
     String getProfileOwnerName(int userHandle);
     void setProfileEnabled(in ComponentName who);
diff --git a/core/java/android/app/backup/BackupAgent.java b/core/java/android/app/backup/BackupAgent.java
index 097dd9c..df27d58 100644
--- a/core/java/android/app/backup/BackupAgent.java
+++ b/core/java/android/app/backup/BackupAgent.java
@@ -126,6 +126,11 @@
     private static final boolean DEBUG = false;
 
     /** @hide */
+    public static final int RESULT_SUCCESS = 0;
+    /** @hide */
+    public static final int RESULT_ERROR = -1;
+
+    /** @hide */
     public static final int TYPE_EOF = 0;
 
     /**
@@ -955,8 +960,10 @@
             BackupDataOutput output = new BackupDataOutput(
                     data.getFileDescriptor(), quotaBytes, transportFlags);
 
+            long result = RESULT_ERROR;
             try {
                 BackupAgent.this.onBackup(oldState, output, newState);
+                result = RESULT_SUCCESS;
             } catch (IOException ex) {
                 Log.d(TAG, "onBackup (" + BackupAgent.this.getClass().getName() + ") threw", ex);
                 throw new RuntimeException(ex);
@@ -971,9 +978,9 @@
 
                 Binder.restoreCallingIdentity(ident);
                 try {
-                    callbackBinder.operationComplete(0);
+                    callbackBinder.operationComplete(result);
                 } catch (RemoteException e) {
-                    // we'll time out anyway, so we're safe
+                    // We will time out anyway.
                 }
 
                 // Don't close the fd out from under the system service if this was local
@@ -1155,10 +1162,16 @@
         }
 
         @Override
-        public void doQuotaExceeded(long backupDataBytes, long quotaBytes) {
+        public void doQuotaExceeded(
+                long backupDataBytes,
+                long quotaBytes,
+                IBackupCallback callbackBinder) {
             long ident = Binder.clearCallingIdentity();
+
+            long result = RESULT_ERROR;
             try {
                 BackupAgent.this.onQuotaExceeded(backupDataBytes, quotaBytes);
+                result = RESULT_SUCCESS;
             } catch (Exception e) {
                 Log.d(TAG, "onQuotaExceeded(" + BackupAgent.this.getClass().getName() + ") threw",
                         e);
@@ -1166,6 +1179,12 @@
             } finally {
                 waitForSharedPrefs();
                 Binder.restoreCallingIdentity(ident);
+
+                try {
+                    callbackBinder.operationComplete(result);
+                } catch (RemoteException e) {
+                    // We will time out anyway.
+                }
             }
         }
     }
diff --git a/core/java/android/app/servertransaction/ActivityResultItem.java b/core/java/android/app/servertransaction/ActivityResultItem.java
index e57f585..bab17dc 100644
--- a/core/java/android/app/servertransaction/ActivityResultItem.java
+++ b/core/java/android/app/servertransaction/ActivityResultItem.java
@@ -18,6 +18,7 @@
 
 import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
 
+import android.annotation.UnsupportedAppUsage;
 import android.app.ClientTransactionHandler;
 import android.app.ResultInfo;
 import android.os.IBinder;
@@ -34,6 +35,7 @@
  */
 public class ActivityResultItem extends ClientTransactionItem {
 
+    @UnsupportedAppUsage
     private List<ResultInfo> mResultInfoList;
 
     /* TODO(b/78294732)
diff --git a/core/java/android/app/servertransaction/ClientTransaction.java b/core/java/android/app/servertransaction/ClientTransaction.java
index 2a33342..f1d87ac 100644
--- a/core/java/android/app/servertransaction/ClientTransaction.java
+++ b/core/java/android/app/servertransaction/ClientTransaction.java
@@ -17,6 +17,7 @@
 package android.app.servertransaction;
 
 import android.annotation.Nullable;
+import android.annotation.UnsupportedAppUsage;
 import android.app.ClientTransactionHandler;
 import android.app.IApplicationThread;
 import android.os.IBinder;
@@ -43,6 +44,7 @@
 public class ClientTransaction implements Parcelable, ObjectPoolItem {
 
     /** A list of individual callbacks to a client. */
+    @UnsupportedAppUsage
     private List<ClientTransactionItem> mActivityCallbacks;
 
     /**
@@ -75,18 +77,21 @@
 
     /** Get the list of callbacks. */
     @Nullable
+    @UnsupportedAppUsage
     List<ClientTransactionItem> getCallbacks() {
         return mActivityCallbacks;
     }
 
     /** Get the target activity. */
     @Nullable
+    @UnsupportedAppUsage
     public IBinder getActivityToken() {
         return mActivityToken;
     }
 
     /** Get the target state lifecycle request. */
     @VisibleForTesting
+    @UnsupportedAppUsage
     public ActivityLifecycleItem getLifecycleStateRequest() {
         return mLifecycleStateRequest;
     }
diff --git a/core/java/android/app/servertransaction/LaunchActivityItem.java b/core/java/android/app/servertransaction/LaunchActivityItem.java
index 6bae359..ed793bf 100644
--- a/core/java/android/app/servertransaction/LaunchActivityItem.java
+++ b/core/java/android/app/servertransaction/LaunchActivityItem.java
@@ -18,6 +18,7 @@
 
 import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
 
+import android.annotation.UnsupportedAppUsage;
 import android.app.ActivityThread.ActivityClientRecord;
 import android.app.ClientTransactionHandler;
 import android.app.ProfilerInfo;
@@ -45,8 +46,10 @@
  */
 public class LaunchActivityItem extends ClientTransactionItem {
 
+    @UnsupportedAppUsage
     private Intent mIntent;
     private int mIdent;
+    @UnsupportedAppUsage
     private ActivityInfo mInfo;
     private Configuration mCurConfig;
     private Configuration mOverrideConfig;
diff --git a/core/java/android/app/servertransaction/NewIntentItem.java b/core/java/android/app/servertransaction/NewIntentItem.java
index e5ce3b0..4f28cd2 100644
--- a/core/java/android/app/servertransaction/NewIntentItem.java
+++ b/core/java/android/app/servertransaction/NewIntentItem.java
@@ -16,6 +16,7 @@
 
 package android.app.servertransaction;
 
+import android.annotation.UnsupportedAppUsage;
 import android.app.ClientTransactionHandler;
 import android.os.IBinder;
 import android.os.Parcel;
@@ -33,6 +34,7 @@
  */
 public class NewIntentItem extends ClientTransactionItem {
 
+    @UnsupportedAppUsage
     private List<ReferrerIntent> mIntents;
     private boolean mPause;
 
diff --git a/core/java/android/bluetooth/le/ScanFilter.java b/core/java/android/bluetooth/le/ScanFilter.java
index c3fae7d..c5d435b 100644
--- a/core/java/android/bluetooth/le/ScanFilter.java
+++ b/core/java/android/bluetooth/le/ScanFilter.java
@@ -58,6 +58,11 @@
     private final ParcelUuid mServiceUuidMask;
 
     @Nullable
+    private final ParcelUuid mServiceSolicitationUuid;
+    @Nullable
+    private final ParcelUuid mServiceSolicitationUuidMask;
+
+    @Nullable
     private final ParcelUuid mServiceDataUuid;
     @Nullable
     private final byte[] mServiceData;
@@ -75,12 +80,15 @@
 
 
     private ScanFilter(String name, String deviceAddress, ParcelUuid uuid,
-            ParcelUuid uuidMask, ParcelUuid serviceDataUuid,
+            ParcelUuid uuidMask, ParcelUuid solicitationUuid,
+            ParcelUuid solicitationUuidMask, ParcelUuid serviceDataUuid,
             byte[] serviceData, byte[] serviceDataMask,
             int manufacturerId, byte[] manufacturerData, byte[] manufacturerDataMask) {
         mDeviceName = name;
         mServiceUuid = uuid;
         mServiceUuidMask = uuidMask;
+        mServiceSolicitationUuid = solicitationUuid;
+        mServiceSolicitationUuidMask = solicitationUuidMask;
         mDeviceAddress = deviceAddress;
         mServiceDataUuid = serviceDataUuid;
         mServiceData = serviceData;
@@ -113,6 +121,14 @@
                 dest.writeParcelable(mServiceUuidMask, flags);
             }
         }
+        dest.writeInt(mServiceSolicitationUuid == null ? 0 : 1);
+        if (mServiceSolicitationUuid != null) {
+            dest.writeParcelable(mServiceSolicitationUuid, flags);
+            dest.writeInt(mServiceSolicitationUuidMask == null ? 0 : 1);
+            if (mServiceSolicitationUuidMask != null) {
+                dest.writeParcelable(mServiceSolicitationUuidMask, flags);
+            }
+        }
         dest.writeInt(mServiceDataUuid == null ? 0 : 1);
         if (mServiceDataUuid != null) {
             dest.writeParcelable(mServiceDataUuid, flags);
@@ -172,6 +188,17 @@
                 }
             }
             if (in.readInt() == 1) {
+                ParcelUuid solicitationUuid = in.readParcelable(
+                        ParcelUuid.class.getClassLoader());
+                builder.setServiceSolicitationUuid(solicitationUuid);
+                if (in.readInt() == 1) {
+                    ParcelUuid solicitationUuidMask = in.readParcelable(
+                            ParcelUuid.class.getClassLoader());
+                    builder.setServiceSolicitationUuid(solicitationUuid,
+                            solicitationUuidMask);
+                }
+            }
+            if (in.readInt() == 1) {
                 ParcelUuid servcieDataUuid =
                         in.readParcelable(ParcelUuid.class.getClassLoader());
                 if (in.readInt() == 1) {
@@ -231,6 +258,22 @@
         return mServiceUuidMask;
     }
 
+    /**
+     * Returns the filter set on the service Solicitation uuid.
+     */
+    @Nullable
+    public ParcelUuid getServiceSolicitationUuid() {
+        return mServiceSolicitationUuid;
+    }
+
+    /**
+     * Returns the filter set on the service Solicitation uuid mask.
+     */
+    @Nullable
+    public ParcelUuid getServiceSolicitationUuidMask() {
+        return mServiceSolicitationUuidMask;
+    }
+
     @Nullable
     public String getDeviceAddress() {
         return mDeviceAddress;
@@ -288,7 +331,7 @@
         // Scan record is null but there exist filters on it.
         if (scanRecord == null
                 && (mDeviceName != null || mServiceUuid != null || mManufacturerData != null
-                || mServiceData != null)) {
+                || mServiceData != null || mServiceSolicitationUuid != null)) {
             return false;
         }
 
@@ -303,6 +346,13 @@
             return false;
         }
 
+        // solicitation UUID match.
+        if (mServiceSolicitationUuid != null && !matchesServiceSolicitationUuids(
+                mServiceSolicitationUuid, mServiceSolicitationUuidMask,
+                scanRecord.getServiceSolicitationUuids())) {
+            return false;
+        }
+
         // Service data match
         if (mServiceDataUuid != null) {
             if (!matchesPartialData(mServiceData, mServiceDataMask,
@@ -350,6 +400,36 @@
         return BitUtils.maskedEquals(data, uuid, mask);
     }
 
+    /**
+     * Check if the solicitation uuid pattern is contained in a list of parcel uuids.
+     *
+     */
+    private static boolean matchesServiceSolicitationUuids(ParcelUuid solicitationUuid,
+            ParcelUuid parcelSolicitationUuidMask, List<ParcelUuid> solicitationUuids) {
+        if (solicitationUuid == null) {
+            return true;
+        }
+        if (solicitationUuids == null) {
+            return false;
+        }
+
+        for (ParcelUuid parcelSolicitationUuid : solicitationUuids) {
+            UUID solicitationUuidMask = parcelSolicitationUuidMask == null
+                    ? null : parcelSolicitationUuidMask.getUuid();
+            if (matchesServiceUuid(solicitationUuid.getUuid(), solicitationUuidMask,
+                    parcelSolicitationUuid.getUuid())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // Check if the solicitation uuid pattern matches the particular service solicitation uuid.
+    private static boolean matchesServiceSolicitationUuid(UUID solicitationUuid,
+            UUID solicitationUuidMask, UUID data) {
+        return BitUtils.maskedEquals(data, solicitationUuid, solicitationUuidMask);
+    }
+
     // Check whether the data pattern matches the parsed data.
     private boolean matchesPartialData(byte[] data, byte[] dataMask, byte[] parsedData) {
         if (parsedData == null || parsedData.length < data.length) {
@@ -376,6 +456,8 @@
         return "BluetoothLeScanFilter [mDeviceName=" + mDeviceName + ", mDeviceAddress="
                 + mDeviceAddress
                 + ", mUuid=" + mServiceUuid + ", mUuidMask=" + mServiceUuidMask
+                + ", mServiceSolicitationUuid=" + mServiceSolicitationUuid
+                + ", mServiceSolicitationUuidMask=" + mServiceSolicitationUuidMask
                 + ", mServiceDataUuid=" + Objects.toString(mServiceDataUuid) + ", mServiceData="
                 + Arrays.toString(mServiceData) + ", mServiceDataMask="
                 + Arrays.toString(mServiceDataMask) + ", mManufacturerId=" + mManufacturerId
@@ -391,7 +473,8 @@
                 mServiceDataUuid,
                 Arrays.hashCode(mServiceData),
                 Arrays.hashCode(mServiceDataMask),
-                mServiceUuid, mServiceUuidMask);
+                mServiceUuid, mServiceUuidMask,
+                mServiceSolicitationUuid, mServiceSolicitationUuidMask);
     }
 
     @Override
@@ -412,7 +495,10 @@
                 && Objects.deepEquals(mServiceData, other.mServiceData)
                 && Objects.deepEquals(mServiceDataMask, other.mServiceDataMask)
                 && Objects.equals(mServiceUuid, other.mServiceUuid)
-                && Objects.equals(mServiceUuidMask, other.mServiceUuidMask);
+                && Objects.equals(mServiceUuidMask, other.mServiceUuidMask)
+                && Objects.equals(mServiceSolicitationUuid, other.mServiceSolicitationUuid)
+                && Objects.equals(mServiceSolicitationUuidMask,
+                        other.mServiceSolicitationUuidMask);
     }
 
     /**
@@ -435,6 +521,9 @@
         private ParcelUuid mServiceUuid;
         private ParcelUuid mUuidMask;
 
+        private ParcelUuid mServiceSolicitationUuid;
+        private ParcelUuid mServiceSolicitationUuidMask;
+
         private ParcelUuid mServiceDataUuid;
         private byte[] mServiceData;
         private byte[] mServiceDataMask;
@@ -493,6 +582,36 @@
             return this;
         }
 
+
+        /**
+         * Set filter on service solicitation uuid.
+         */
+        public Builder setServiceSolicitationUuid(ParcelUuid serviceSolicitationUuid) {
+            mServiceSolicitationUuid = serviceSolicitationUuid;
+            return this;
+        }
+
+
+        /**
+         * Set filter on partial service Solicitation uuid. The {@code SolicitationUuidMask} is the
+         * bit mask for the {@code serviceSolicitationUuid}. Set any bit in the mask to 1 to
+         * indicate a match is needed for the bit in {@code serviceSolicitationUuid}, and 0 to
+         * ignore that bit.
+         *
+         * @throws IllegalArgumentException If {@code serviceSolicitationUuid} is {@code null} but
+         *             {@code serviceSolicitationUuidMask} is not {@code null}.
+         */
+        public Builder setServiceSolicitationUuid(ParcelUuid serviceSolicitationUuid,
+                ParcelUuid solicitationUuidMask) {
+            if (mServiceSolicitationUuidMask != null && mServiceSolicitationUuid == null) {
+                throw new IllegalArgumentException(
+                        "SolicitationUuid is null while SolicitationUuidMask is not null!");
+            }
+            mServiceSolicitationUuid = serviceSolicitationUuid;
+            mServiceSolicitationUuidMask = solicitationUuidMask;
+            return this;
+        }
+
         /**
          * Set filtering on service data.
          *
@@ -598,7 +717,8 @@
          */
         public ScanFilter build() {
             return new ScanFilter(mDeviceName, mDeviceAddress,
-                    mServiceUuid, mUuidMask,
+                    mServiceUuid, mUuidMask, mServiceSolicitationUuid,
+                    mServiceSolicitationUuidMask,
                     mServiceDataUuid, mServiceData, mServiceDataMask,
                     mManufacturerId, mManufacturerData, mManufacturerDataMask);
         }
diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java
index 07ed18d..7988008 100644
--- a/core/java/android/bluetooth/le/ScanRecord.java
+++ b/core/java/android/bluetooth/le/ScanRecord.java
@@ -51,6 +51,9 @@
     private static final int DATA_TYPE_SERVICE_DATA_16_BIT = 0x16;
     private static final int DATA_TYPE_SERVICE_DATA_32_BIT = 0x20;
     private static final int DATA_TYPE_SERVICE_DATA_128_BIT = 0x21;
+    private static final int DATA_TYPE_SERVICE_SOLICITATION_UUIDS_16_BIT = 0x14;
+    private static final int DATA_TYPE_SERVICE_SOLICITATION_UUIDS_32_BIT = 0x1F;
+    private static final int DATA_TYPE_SERVICE_SOLICITATION_UUIDS_128_BIT = 0x15;
     private static final int DATA_TYPE_MANUFACTURER_SPECIFIC_DATA = 0xFF;
 
     // Flags of the advertising data.
@@ -58,6 +61,8 @@
 
     @Nullable
     private final List<ParcelUuid> mServiceUuids;
+    @Nullable
+    private final List<ParcelUuid> mServiceSolicitationUuids;
 
     private final SparseArray<byte[]> mManufacturerSpecificData;
 
@@ -89,6 +94,15 @@
     }
 
     /**
+     * Returns a list of service solicitation UUIDs within the advertisement that are used to
+     * identify the Bluetooth GATT services.
+     */
+    @Nullable
+    public List<ParcelUuid> getServiceSolicitationUuids() {
+        return mServiceSolicitationUuids;
+    }
+
+    /**
      * Returns a sparse array of manufacturer identifier and its corresponding manufacturer specific
      * data.
      */
@@ -151,10 +165,12 @@
     }
 
     private ScanRecord(List<ParcelUuid> serviceUuids,
+            List<ParcelUuid> serviceSolicitationUuids,
             SparseArray<byte[]> manufacturerData,
             Map<ParcelUuid, byte[]> serviceData,
             int advertiseFlags, int txPowerLevel,
             String localName, byte[] bytes) {
+        mServiceSolicitationUuids = serviceSolicitationUuids;
         mServiceUuids = serviceUuids;
         mManufacturerSpecificData = manufacturerData;
         mServiceData = serviceData;
@@ -184,6 +200,7 @@
         int currentPos = 0;
         int advertiseFlag = -1;
         List<ParcelUuid> serviceUuids = new ArrayList<ParcelUuid>();
+        List<ParcelUuid> serviceSolicitationUuids = new ArrayList<ParcelUuid>();
         String localName = null;
         int txPowerLevel = Integer.MIN_VALUE;
 
@@ -220,6 +237,18 @@
                         parseServiceUuid(scanRecord, currentPos, dataLength,
                                 BluetoothUuid.UUID_BYTES_128_BIT, serviceUuids);
                         break;
+                    case DATA_TYPE_SERVICE_SOLICITATION_UUIDS_16_BIT:
+                        parseServiceSolicitationUuid(scanRecord, currentPos, dataLength,
+                                BluetoothUuid.UUID_BYTES_16_BIT, serviceSolicitationUuids);
+                        break;
+                    case DATA_TYPE_SERVICE_SOLICITATION_UUIDS_32_BIT:
+                        parseServiceSolicitationUuid(scanRecord, currentPos, dataLength,
+                                BluetoothUuid.UUID_BYTES_32_BIT, serviceSolicitationUuids);
+                        break;
+                    case DATA_TYPE_SERVICE_SOLICITATION_UUIDS_128_BIT:
+                        parseServiceSolicitationUuid(scanRecord, currentPos, dataLength,
+                                BluetoothUuid.UUID_BYTES_128_BIT, serviceSolicitationUuids);
+                        break;
                     case DATA_TYPE_LOCAL_NAME_SHORT:
                     case DATA_TYPE_LOCAL_NAME_COMPLETE:
                         localName = new String(
@@ -265,19 +294,23 @@
             if (serviceUuids.isEmpty()) {
                 serviceUuids = null;
             }
-            return new ScanRecord(serviceUuids, manufacturerData, serviceData,
-                    advertiseFlag, txPowerLevel, localName, scanRecord);
+            if (serviceSolicitationUuids.isEmpty()) {
+                serviceSolicitationUuids = null;
+            }
+            return new ScanRecord(serviceUuids, serviceSolicitationUuids, manufacturerData,
+                    serviceData, advertiseFlag, txPowerLevel, localName, scanRecord);
         } catch (Exception e) {
             Log.e(TAG, "unable to parse scan record: " + Arrays.toString(scanRecord));
             // As the record is invalid, ignore all the parsed results for this packet
             // and return an empty record with raw scanRecord bytes in results
-            return new ScanRecord(null, null, null, -1, Integer.MIN_VALUE, null, scanRecord);
+            return new ScanRecord(null, null, null, null, -1, Integer.MIN_VALUE, null, scanRecord);
         }
     }
 
     @Override
     public String toString() {
         return "ScanRecord [mAdvertiseFlags=" + mAdvertiseFlags + ", mServiceUuids=" + mServiceUuids
+                + ", mServiceSolicitationUuids=" + mServiceSolicitationUuids
                 + ", mManufacturerSpecificData=" + BluetoothLeUtils.toString(
                 mManufacturerSpecificData)
                 + ", mServiceData=" + BluetoothLeUtils.toString(mServiceData)
@@ -297,6 +330,20 @@
         return currentPos;
     }
 
+    /**
+     * Parse service Solicitation UUIDs.
+     */
+    private static int parseServiceSolicitationUuid(byte[] scanRecord, int currentPos,
+            int dataLength, int uuidLength, List<ParcelUuid> serviceSolicitationUuids) {
+        while (dataLength > 0) {
+            byte[] uuidBytes = extractBytes(scanRecord, currentPos, uuidLength);
+            serviceSolicitationUuids.add(BluetoothUuid.parseUuidFrom(uuidBytes));
+            dataLength -= uuidLength;
+            currentPos += uuidLength;
+        }
+        return currentPos;
+    }
+
     // Helper method to extract bytes from byte array.
     private static byte[] extractBytes(byte[] scanRecord, int start, int length) {
         byte[] bytes = new byte[length];
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 085d77d..f5339ef 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -236,9 +236,15 @@
                 // However, the caller may be expecting to access them my index. Hence,
                 // we have to execute the query as if allowed to get a cursor with the
                 // columns. We then use the column names to return an empty cursor.
-                Cursor cursor = ContentProvider.this.query(
-                        uri, projection, queryArgs,
-                        CancellationSignal.fromTransport(cancellationSignal));
+                Cursor cursor;
+                final String original = setCallingPackage(callingPkg);
+                try {
+                    cursor = ContentProvider.this.query(
+                            uri, projection, queryArgs,
+                            CancellationSignal.fromTransport(cancellationSignal));
+                } finally {
+                    setCallingPackage(original);
+                }
                 if (cursor == null) {
                     return null;
                 }
@@ -260,6 +266,7 @@
 
         @Override
         public String getType(Uri uri) {
+            // getCallingPackage() isn't available in getType(), as the javadoc states.
             validateIncomingUri(uri);
             uri = maybeGetUriWithoutUserId(uri);
             Trace.traceBegin(TRACE_TAG_DATABASE, "getType");
@@ -276,7 +283,12 @@
             int userId = getUserIdFromUri(uri);
             uri = maybeGetUriWithoutUserId(uri);
             if (enforceWritePermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
-                return rejectInsert(uri, initialValues);
+                final String original = setCallingPackage(callingPkg);
+                try {
+                    return rejectInsert(uri, initialValues);
+                } finally {
+                    setCallingPackage(original);
+                }
             }
             Trace.traceBegin(TRACE_TAG_DATABASE, "insert");
             final String original = setCallingPackage(callingPkg);
@@ -440,6 +452,7 @@
 
         @Override
         public String[] getStreamTypes(Uri uri, String mimeTypeFilter) {
+            // getCallingPackage() isn't available in getType(), as the javadoc states.
             validateIncomingUri(uri);
             uri = maybeGetUriWithoutUserId(uri);
             Trace.traceBegin(TRACE_TAG_DATABASE, "getStreamTypes");
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 5867a9c..a882434 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -437,6 +437,12 @@
      */
     public static final String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";
 
+    /**
+     * Default MIME type for files whose type is otherwise unknown.
+     * @hide
+     */
+    public static final String MIME_TYPE_DEFAULT = "application/octet-stream";
+
     /** @hide */
     @UnsupportedAppUsage
     public static final int SYNC_ERROR_SYNC_ALREADY_IN_PROGRESS = 1;
@@ -2124,7 +2130,7 @@
                     uri, observer == null ? null : observer.getContentObserver(),
                     observer != null && observer.deliverSelfNotifications(),
                     syncToNetwork ? NOTIFY_SYNC_TO_NETWORK : 0,
-                    userHandle, mTargetSdkVersion);
+                    userHandle, mTargetSdkVersion, mContext.getPackageName());
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
@@ -2141,7 +2147,7 @@
             getContentService().notifyChange(
                     uri, observer == null ? null : observer.getContentObserver(),
                     observer != null && observer.deliverSelfNotifications(), flags,
-                    userHandle, mTargetSdkVersion);
+                    userHandle, mTargetSdkVersion, mContext.getPackageName());
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
@@ -2314,7 +2320,9 @@
                 .syncOnce()     // Immediate sync.
                 .build();
         try {
-            getContentService().syncAsUser(request, userId);
+            // Note ActivityThread.currentPackageName() may not be accurate in a shared process
+            // case, but it's only for debugging.
+            getContentService().syncAsUser(request, userId, ActivityThread.currentPackageName());
         } catch(RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
@@ -2326,7 +2334,9 @@
      */
     public static void requestSync(SyncRequest request) {
         try {
-            getContentService().sync(request);
+            // Note ActivityThread.currentPackageName() may not be accurate in a shared process
+            // case, but it's only for debugging.
+            getContentService().sync(request, ActivityThread.currentPackageName());
         } catch(RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index a352e84..ddd12a5 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1701,7 +1701,7 @@
      * @hide
      */
     @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)
-    @UnsupportedAppUsage
+    @SystemApi
     public void startActivityAsUser(@RequiresPermission Intent intent, UserHandle user) {
         throw new RuntimeException("Not implemented. Must override in a subclass.");
     }
@@ -3672,6 +3672,15 @@
     public static final String AUDIO_SERVICE = "audio";
 
     /**
+     * Use with {@link #getSystemService(String)}
+     *
+     * @hide
+     * @see #getSystemService(String)
+     * @see com.android.server.biometrics.BiometricPromptService
+     */
+    public static final String BIOMETRIC_PROMPT_SERVICE = "biometric_prompt";
+
+    /**
      * Use with {@link #getSystemService(String)} to retrieve a
      * {@link android.hardware.fingerprint.FingerprintManager} for handling management
      * of fingerprints.
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index 1cc398e..c5dce017 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -385,7 +385,6 @@
 
     /** @hide */
     @Override
-    @UnsupportedAppUsage
     public void startActivityAsUser(Intent intent, UserHandle user) {
         mBase.startActivityAsUser(intent, user);
     }
diff --git a/core/java/android/content/IContentService.aidl b/core/java/android/content/IContentService.aidl
index dc17666..a55dd31 100644
--- a/core/java/android/content/IContentService.aidl
+++ b/core/java/android/content/IContentService.aidl
@@ -53,14 +53,14 @@
      */
     void notifyChange(in Uri uri, IContentObserver observer,
             boolean observerWantsSelfNotifications, int flags,
-            int userHandle, int targetSdkVersion);
+            int userHandle, int targetSdkVersion, String callingPackage);
 
-    void requestSync(in Account account, String authority, in Bundle extras);
+    void requestSync(in Account account, String authority, in Bundle extras, String callingPackage);
     /**
      * Start a sync given a request.
      */
-    void sync(in SyncRequest request);
-    void syncAsUser(in SyncRequest request, int userId);
+    void sync(in SyncRequest request, String callingPackage);
+    void syncAsUser(in SyncRequest request, int userId, String callingPackage);
     void cancelSync(in Account account, String authority, in ComponentName cname);
     void cancelSyncAsUser(in Account account, String authority, in ComponentName cname, int userId);
 
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 8c2b76f..3c8d9d03 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -4440,6 +4440,7 @@
      *
      * @hide
      */
+    @SystemApi
     public static final String EXTRA_USER_ID = "android.intent.extra.USER_ID";
 
     /**
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index b7a5352..1108f93 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -1009,6 +1009,13 @@
     public String appComponentFactory;
 
     /**
+     * Indicates whether this package requires access to non-SDK APIs. Only system apps
+     * and tests are allowed to use this property.
+     * @hide
+     */
+    public boolean usesNonSdkApi;
+
+    /**
      * The category of this app. Categories are used to cluster multiple apps
      * together into meaningful groups, such as when summarizing battery,
      * network, or disk usage. Apps should only define this value when they fit
@@ -1712,8 +1719,13 @@
     }
 
     private boolean isAllowedToUseHiddenApis() {
-        return isSignedWithPlatformKey()
-            || (isPackageWhitelistedForHiddenApis() && (isSystemApp() || isUpdatedSystemApp()));
+        if (isSignedWithPlatformKey()) {
+            return true;
+        } else if (isSystemApp() || isUpdatedSystemApp()) {
+            return usesNonSdkApi || isPackageWhitelistedForHiddenApis();
+        } else {
+            return false;
+        }
     }
 
     /**
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index bc5b32c..6a20c93 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -37,7 +37,6 @@
 import android.content.pm.InstrumentationInfo;
 import android.content.pm.KeySet;
 import android.content.pm.PackageInfo;
-import android.content.pm.PackageCleanItem;
 import android.content.pm.ParceledListSlice;
 import android.content.pm.ProviderInfo;
 import android.content.pm.PermissionGroupInfo;
@@ -553,8 +552,6 @@
      */
     void reconcileSecondaryDexFiles(String packageName);
 
-    PackageCleanItem nextPackageToClean(in PackageCleanItem lastPackage);
-
     int getMoveStatus(int moveId);
 
     void registerMoveCallback(in IPackageMoveObserver callback);
diff --git a/core/java/android/content/pm/PackageCleanItem.aidl b/core/java/android/content/pm/PackageCleanItem.aidl
deleted file mode 100644
index 9bb203e..0000000
--- a/core/java/android/content/pm/PackageCleanItem.aidl
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.content.pm;
-
-parcelable PackageCleanItem;
diff --git a/core/java/android/content/pm/PackageCleanItem.java b/core/java/android/content/pm/PackageCleanItem.java
deleted file mode 100644
index e1656d6..0000000
--- a/core/java/android/content/pm/PackageCleanItem.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.pm;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/** @hide */
-public class PackageCleanItem implements Parcelable {
-    public final int userId;
-    public final String packageName;
-    public final boolean andCode;
-
-    public PackageCleanItem(int userId, String packageName, boolean andCode) {
-        this.userId = userId;
-        this.packageName = packageName;
-        this.andCode = andCode;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        try {
-            if (obj != null) {
-                PackageCleanItem other = (PackageCleanItem)obj;
-                return userId == other.userId && packageName.equals(other.packageName)
-                        && andCode == other.andCode;
-            }
-        } catch (ClassCastException e) {
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = 17;
-        result = 31 * result + userId;
-        result = 31 * result + packageName.hashCode();
-        result = 31 * result + (andCode ? 1 : 0);
-        return result;
-    }
-
-    public int describeContents() {
-        return 0;
-    }
-
-    public void writeToParcel(Parcel dest, int parcelableFlags) {
-        dest.writeInt(userId);
-        dest.writeString(packageName);
-        dest.writeInt(andCode ? 1 : 0);
-    }
-
-    public static final Parcelable.Creator<PackageCleanItem> CREATOR
-            = new Parcelable.Creator<PackageCleanItem>() {
-        public PackageCleanItem createFromParcel(Parcel source) {
-            return new PackageCleanItem(source);
-        }
-
-        public PackageCleanItem[] newArray(int size) {
-            return new PackageCleanItem[size];
-        }
-    };
-
-    private PackageCleanItem(Parcel source) {
-        userId = source.readInt();
-        packageName = source.readString();
-        andCode = source.readInt() != 0;
-    }
-}
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 4f39ec0..7d8ff4c 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2281,6 +2281,14 @@
 
     /**
      * Feature for {@link #getSystemAvailableFeatures} and
+     * {@link #hasSystemFeature}: The device has biometric hardware to perform iris authentication.
+     * @hide
+     */
+    @SdkConstant(SdkConstantType.FEATURE)
+    public static final String FEATURE_IRIS = "android.hardware.iris";
+
+    /**
+     * Feature for {@link #getSystemAvailableFeatures} and
      * {@link #hasSystemFeature}: The device supports portrait orientation
      * screens.  For backwards compatibility, you can assume that if neither
      * this nor {@link #FEATURE_SCREEN_LANDSCAPE} is set then the device supports
@@ -2678,13 +2686,6 @@
             "android.software.device_id_attestation";
 
     /**
-     * Action to external storage service to clean out removed apps.
-     * @hide
-     */
-    public static final String ACTION_CLEAN_EXTERNAL_STORAGE
-            = "android.content.pm.CLEAN_EXTERNAL_STORAGE";
-
-    /**
      * Extra field name for the URI to a verification file. Passed to a package
      * verifier.
      *
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 83757c4..8b058dc 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -3659,6 +3659,9 @@
             ai.appComponentFactory = buildClassName(ai.packageName, factory, outError);
         }
 
+        ai.usesNonSdkApi = sa.getBoolean(
+                com.android.internal.R.styleable.AndroidManifestApplication_usesNonSdkApi, false);
+
         if (outError[0] == null) {
             CharSequence pname;
             if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.FROYO) {
diff --git a/core/java/android/content/res/ObbInfo.java b/core/java/android/content/res/ObbInfo.java
index 452fdce..1d10b4f 100644
--- a/core/java/android/content/res/ObbInfo.java
+++ b/core/java/android/content/res/ObbInfo.java
@@ -80,6 +80,7 @@
     }
 
     public void writeToParcel(Parcel dest, int parcelableFlags) {
+        // Keep this in sync with writeToParcel() in ObbInfo.cpp
         dest.writeString(filename);
         dest.writeString(packageName);
         dest.writeInt(version);
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index cd250b8..43e1612 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -916,8 +916,10 @@
      *           tool. This integer encodes the package, type, and resource
      *           entry. The value 0 is an invalid identifier.
      * @throws NotFoundException Throws NotFoundException if the given ID does not exist.
-     * 
+     *
+     * @deprecated Prefer {@link android.graphics.drawable.AnimatedImageDrawable}.
      */
+    @Deprecated
     public Movie getMovie(@RawRes int id) throws NotFoundException {
         final InputStream is = openRawResource(id);
         final Movie movie = Movie.decodeStream(is);
diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java
index 30d2d5f..508626b 100644
--- a/core/java/android/content/res/TypedArray.java
+++ b/core/java/android/content/res/TypedArray.java
@@ -85,11 +85,47 @@
     /*package*/ XmlBlock.Parser mXml;
     @UnsupportedAppUsage
     /*package*/ Resources.Theme mTheme;
+    /**
+     * mData is used to hold the value/id and other metadata about each attribute.
+     *
+     * [type, data, asset cookie, resource id, changing configuration, density]
+     *
+     * type - type of this attribute, see TypedValue#TYPE_*
+     *
+     * data - can be used in various ways:
+     *     a) actual value of the attribute if type is between #TYPE_FIRST_INT and #TYPE_LAST_INT
+     *        1) color represented by an integer (#TYPE_INT_COLOR_*)
+     *        2) boolean represented by an integer (#TYPE_INT_BOOLEAN)
+     *        3) integer number (#TYPE_TYPE_INT_DEC or #TYPE_INT_HEX)
+     *        4) float number where integer gets interpreted as float (#TYPE_FLOAT, #TYPE_FRACTION
+     *            and #TYPE_DIMENSION)
+     *     b) index into string block inside AssetManager (#TYPE_STRING)
+     *     c) attribute resource id in the current theme/style (#TYPE_ATTRIBUTE)
+     *
+     * asset cookie - used in two ways:
+     *     a) for strings, drawables, and fonts it specifies the set of apk assets to look at
+     *     (multi-apk case)
+     *     b) cookie + asset as a unique identifier for drawable caches
+     *
+     * resource id - id that was finally used to resolve this attribute
+     *
+     * changing configuration - a mask of the configuration parameters for which the values in this
+     * attribute may change
+     *
+     * density - density of drawable pointed to by this attribute
+     */
     @UnsupportedAppUsage
     /*package*/ int[] mData;
+    /**
+     * Pointer to the start of the memory address of mData. It is passed via JNI and used to write
+     * to mData array directly from native code (AttributeResolution.cpp).
+     */
     /*package*/ long mDataAddress;
     @UnsupportedAppUsage
     /*package*/ int[] mIndices;
+    /**
+     * Similar to mDataAddress, but instead it is a pointer to mIndices address.
+     */
     /*package*/ long mIndicesAddress;
     @UnsupportedAppUsage
     /*package*/ int mLength;
diff --git a/core/java/android/database/OWNERS b/core/java/android/database/OWNERS
index 592a852..7e19942 100644
--- a/core/java/android/database/OWNERS
+++ b/core/java/android/database/OWNERS
@@ -1,3 +1,3 @@
 omakoto@google.com
-jsharkey@google.com
-yamasani@google.com
\ No newline at end of file
+jsharkey@android.com
+yamasani@google.com
diff --git a/core/java/android/database/sqlite/SQLiteCompatibilityWalFlags.java b/core/java/android/database/sqlite/SQLiteCompatibilityWalFlags.java
index 06c069c..8ea1db2 100644
--- a/core/java/android/database/sqlite/SQLiteCompatibilityWalFlags.java
+++ b/core/java/android/database/sqlite/SQLiteCompatibilityWalFlags.java
@@ -16,6 +16,7 @@
 
 package android.database.sqlite;
 
+import android.annotation.TestApi;
 import android.app.ActivityThread;
 import android.app.Application;
 import android.provider.Settings;
@@ -33,6 +34,7 @@
  * for consistent behavior across all connections opened in the process.
  * @hide
  */
+@TestApi
 public class SQLiteCompatibilityWalFlags {
 
     private static final String TAG = "SQLiteCompatibilityWalFlags";
@@ -45,6 +47,9 @@
     // This flag is used to avoid recursive initialization due to circular dependency on Settings
     private static volatile boolean sCallingGlobalSettings;
 
+    private SQLiteCompatibilityWalFlags() {
+    }
+
     /**
      * @hide
      */
@@ -140,6 +145,7 @@
      * @hide
      */
     @VisibleForTesting
+    @TestApi
     public static void reset() {
         sInitialized = false;
         sFlagsSet = false;
diff --git a/core/java/android/hardware/OWNERS b/core/java/android/hardware/OWNERS
index b8fea55..29a339a 100644
--- a/core/java/android/hardware/OWNERS
+++ b/core/java/android/hardware/OWNERS
@@ -1,7 +1,2 @@
 # Camera
-per-file *Camera* = cychen@google.com
-per-file *Camera* = epeev@google.com
-per-file *Camera* = etalvala@google.com
-per-file *Camera* = shuzhenwang@google.com
-per-file *Camera* = yinchiayeh@google.com
-per-file *Camera* = zhijunhe@google.com
+per-file *Camera* = cychen@google.com,epeev@google.com,etalvala@google.com,shuzhenwang@google.com,yinchiayeh@google.com,zhijunhe@google.com
diff --git a/core/java/android/hardware/biometrics/BiometricAuthenticator.java b/core/java/android/hardware/biometrics/BiometricAuthenticator.java
index e7c5116..dbb2527 100644
--- a/core/java/android/hardware/biometrics/BiometricAuthenticator.java
+++ b/core/java/android/hardware/biometrics/BiometricAuthenticator.java
@@ -30,6 +30,21 @@
 public interface BiometricAuthenticator {
 
     /**
+     * @hide
+     */
+    int TYPE_FINGERPRINT = 1;
+
+    /**
+     * @hide
+     */
+    int TYPE_IRIS = 2;
+
+    /**
+     * @hide
+     */
+    int TYPE_FACE = 3;
+
+    /**
      * Container for biometric data
      * @hide
      */
@@ -161,12 +176,6 @@
         public void onAuthenticationHelp(int helpCode, CharSequence helpString) {}
 
         /**
-         * Called when a biometric is recognized.
-         * @param result An object containing authentication-related data
-         */
-        public void onAuthenticationSucceeded(AuthenticationResult result) {}
-
-        /**
          * Called when a biometric is valid but not recognized.
          */
         public void onAuthenticationFailed() {}
@@ -179,6 +188,45 @@
     };
 
     /**
+     * @return true if the biometric hardware is detected.
+     */
+    default boolean isHardwareDetected() {
+        throw new UnsupportedOperationException("Stub!");
+    }
+
+    /**
+     * @return true if the user has enrolled templates for this biometric.
+     */
+    default boolean hasEnrolledTemplates() {
+        throw new UnsupportedOperationException("Stub!");
+    }
+
+    /**
+     * @param error
+     * @param vendorCode
+     * @return the error string associated with this error
+     */
+    default String getErrorString(int error, int vendorCode) {
+        throw new UnsupportedOperationException("Stub!");
+    }
+
+    /**
+     * @param acquireInfo
+     * @param vendorCode
+     * @return the help string associated with this code
+     */
+    default String getAcquiredString(int acquireInfo, int vendorCode) {
+        throw new UnsupportedOperationException("Stub!");
+    }
+
+    /**
+     * @return one of {@link #TYPE_FINGERPRINT} {@link #TYPE_IRIS} or {@link #TYPE_FACE}
+     */
+    default int getType() {
+        throw new UnsupportedOperationException("Stub!");
+    }
+
+    /**
      * This call warms up the hardware and starts scanning for valid biometrics. It terminates
      * when {@link AuthenticationCallback#onAuthenticationError(int,
      * CharSequence)} is called or when {@link AuthenticationCallback#onAuthenticationSucceeded(
@@ -198,10 +246,12 @@
      * @param executor An executor to handle callback events
      * @param callback An object to receive authentication events
      */
-    void authenticate(@NonNull CryptoObject crypto,
+    default void authenticate(@NonNull CryptoObject crypto,
             @NonNull CancellationSignal cancel,
             @NonNull @CallbackExecutor Executor executor,
-            @NonNull AuthenticationCallback callback);
+            @NonNull AuthenticationCallback callback) {
+        throw new UnsupportedOperationException("Stub!");
+    }
 
     /**
      * This call warms up the hardware and starts scanning for valid biometrics. It terminates
@@ -221,7 +271,9 @@
      * @param executor An executor to handle callback events
      * @param callback An object to receive authentication events
      */
-    void authenticate(@NonNull CancellationSignal cancel,
+    default void authenticate(@NonNull CancellationSignal cancel,
             @NonNull @CallbackExecutor Executor executor,
-            @NonNull AuthenticationCallback callback);
+            @NonNull AuthenticationCallback callback) {
+        throw new UnsupportedOperationException("Stub!");
+    }
 }
diff --git a/core/java/android/hardware/biometrics/BiometricConstants.java b/core/java/android/hardware/biometrics/BiometricConstants.java
index 5cf8f45..6150be3 100644
--- a/core/java/android/hardware/biometrics/BiometricConstants.java
+++ b/core/java/android/hardware/biometrics/BiometricConstants.java
@@ -16,6 +16,8 @@
 
 package android.hardware.biometrics;
 
+import android.annotation.UnsupportedAppUsage;
+
 
 /**
  * Interface containing all of the biometric modality agnostic constants.
@@ -119,6 +121,7 @@
     /**
      * @hide
      */
+    @UnsupportedAppUsage
     int BIOMETRIC_ERROR_VENDOR_BASE = 1000;
 
     //
@@ -172,5 +175,5 @@
     /**
      * @hide
      */
-    int BIOMETRICT_ACQUIRED_VENDOR_BASE = 1000;
+    int BIOMETRIC_ACQUIRED_VENDOR_BASE = 1000;
 }
diff --git a/core/java/android/hardware/biometrics/BiometricFaceConstants.java b/core/java/android/hardware/biometrics/BiometricFaceConstants.java
index 4aa1e76..c788bc5 100644
--- a/core/java/android/hardware/biometrics/BiometricFaceConstants.java
+++ b/core/java/android/hardware/biometrics/BiometricFaceConstants.java
@@ -229,7 +229,8 @@
      *
      * @hide
      */
-    public static final int FACE_ACQUIRED_VENDOR = 13;
+    public static final int FACE_ACQUIRED_VENDOR = 14;
+
     /**
      * @hide
      */
diff --git a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java
index d583d78..041b2e6 100644
--- a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java
+++ b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java
@@ -16,6 +16,7 @@
 
 package android.hardware.biometrics;
 
+import android.annotation.UnsupportedAppUsage;
 import android.hardware.fingerprint.FingerprintManager;
 
 /**
@@ -120,6 +121,7 @@
     /**
      * @hide
      */
+    @UnsupportedAppUsage
     public static final int FINGERPRINT_ERROR_VENDOR_BASE = 1000;
 
     //
diff --git a/core/java/android/hardware/biometrics/BiometricPrompt.java b/core/java/android/hardware/biometrics/BiometricPrompt.java
index 02bcff5..1cca27d 100644
--- a/core/java/android/hardware/biometrics/BiometricPrompt.java
+++ b/core/java/android/hardware/biometrics/BiometricPrompt.java
@@ -20,14 +20,20 @@
 
 import android.annotation.CallbackExecutor;
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.pm.PackageManager;
-import android.hardware.fingerprint.FingerprintManager;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.CancellationSignal;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.ServiceManager;
 import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.R;
 
 import java.security.Signature;
 import java.util.concurrent.Executor;
@@ -40,6 +46,8 @@
  */
 public class BiometricPrompt implements BiometricAuthenticator, BiometricConstants {
 
+    private static final String TAG = "BiometricPrompt";
+
     /**
      * @hide
      */
@@ -208,11 +216,23 @@
         }
     }
 
-    private PackageManager mPackageManager;
-    private FingerprintManager mFingerprintManager;
-    private Bundle mBundle;
-    private ButtonInfo mPositiveButtonInfo;
-    private ButtonInfo mNegativeButtonInfo;
+    private class OnAuthenticationCancelListener implements CancellationSignal.OnCancelListener {
+        @Override
+        public void onCancel() {
+            cancelAuthentication();
+        }
+    }
+
+    private final IBinder mToken = new Binder();
+    private final Context mContext;
+    private final IBiometricPromptService mService;
+    private final Bundle mBundle;
+    private final ButtonInfo mPositiveButtonInfo;
+    private final ButtonInfo mNegativeButtonInfo;
+
+    private CryptoObject mCryptoObject;
+    private Executor mExecutor;
+    private AuthenticationCallback mAuthenticationCallback;
 
     IBiometricPromptReceiver mDialogReceiver = new IBiometricPromptReceiver.Stub() {
         @Override
@@ -230,13 +250,48 @@
         }
     };
 
+    IBiometricPromptServiceReceiver mBiometricPromptServiceReceiver =
+            new IBiometricPromptServiceReceiver.Stub() {
+
+        @Override
+        public void onAuthenticationSucceeded(long deviceId) throws RemoteException {
+            mExecutor.execute(() -> {
+                final AuthenticationResult result = new AuthenticationResult(mCryptoObject);
+                mAuthenticationCallback.onAuthenticationSucceeded(result);
+            });
+        }
+
+        @Override
+        public void onAuthenticationFailed(long deviceId) throws RemoteException {
+            mExecutor.execute(() -> {
+                mAuthenticationCallback.onAuthenticationFailed();
+            });
+        }
+
+        @Override
+        public void onError(long deviceId, int error, String message)
+                throws RemoteException {
+            mExecutor.execute(() -> {
+                mAuthenticationCallback.onAuthenticationError(error, message);
+            });
+        }
+
+        @Override
+        public void onAcquired(long deviceId, int acquireInfo, String message) {
+            mExecutor.execute(() -> {
+                mAuthenticationCallback.onAuthenticationHelp(acquireInfo, message);
+            });
+        }
+    };
+
     private BiometricPrompt(Context context, Bundle bundle,
             ButtonInfo positiveButtonInfo, ButtonInfo negativeButtonInfo) {
+        mContext = context;
         mBundle = bundle;
         mPositiveButtonInfo = positiveButtonInfo;
         mNegativeButtonInfo = negativeButtonInfo;
-        mFingerprintManager = context.getSystemService(FingerprintManager.class);
-        mPackageManager = context.getPackageManager();
+        mService = IBiometricPromptService.Stub.asInterface(
+                ServiceManager.getService(Context.BIOMETRIC_PROMPT_SERVICE));
     }
 
     /**
@@ -290,13 +345,12 @@
         /**
          * Authentication result
          * @param crypto
-         * @param identifier
-         * @param userId
          * @hide
          */
-        public AuthenticationResult(CryptoObject crypto, Identifier identifier,
-                int userId) {
-            super(crypto, identifier, userId);
+        public AuthenticationResult(CryptoObject crypto) {
+            // For compatibility, this extends from common base class as FingerprintManager does.
+            // Identifier and userId is not used for BiometricPrompt.
+            super(crypto, null /* identifier */, 0 /* userId */);
         }
         /**
          * Obtain the crypto object associated with this transaction
@@ -353,53 +407,6 @@
          */
         @Override
         public void onAuthenticationAcquired(int acquireInfo) {}
-
-        /**
-         * @param result An object containing authentication-related data
-         * @hide
-         */
-        @Override
-        public void onAuthenticationSucceeded(BiometricAuthenticator.AuthenticationResult result) {
-            onAuthenticationSucceeded(new AuthenticationResult(
-                    (CryptoObject) result.getCryptoObject(),
-                    result.getId(),
-                    result.getUserId()));
-        }
-    }
-
-    /**
-     * @param crypto Object associated with the call
-     * @param cancel An object that can be used to cancel authentication
-     * @param executor An executor to handle callback events
-     * @param callback An object to receive authentication events
-     * @hide
-     */
-    @Override
-    public void authenticate(@NonNull android.hardware.biometrics.CryptoObject crypto,
-            @NonNull CancellationSignal cancel,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull BiometricAuthenticator.AuthenticationCallback callback) {
-        if (!(callback instanceof BiometricPrompt.AuthenticationCallback)) {
-            throw new IllegalArgumentException("Callback cannot be casted");
-        }
-        authenticate(crypto, cancel, executor, (AuthenticationCallback) callback);
-    }
-
-    /**
-     *
-     * @param cancel An object that can be used to cancel authentication
-     * @param executor An executor to handle callback events
-     * @param callback An object to receive authentication events
-     * @hide
-     */
-    @Override
-    public void authenticate(@NonNull CancellationSignal cancel,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull BiometricAuthenticator.AuthenticationCallback callback) {
-        if (!(callback instanceof BiometricPrompt.AuthenticationCallback)) {
-            throw new IllegalArgumentException("Callback cannot be casted");
-        }
-        authenticate(cancel, executor, (AuthenticationCallback) callback);
     }
 
     /**
@@ -430,11 +437,19 @@
             @NonNull CancellationSignal cancel,
             @NonNull @CallbackExecutor Executor executor,
             @NonNull AuthenticationCallback callback) {
-        if (handlePreAuthenticationErrors(callback, executor)) {
-            return;
+        if (crypto == null) {
+            throw new IllegalArgumentException("Must supply a crypto object");
         }
-        mFingerprintManager.authenticate(crypto, cancel, mBundle, executor, mDialogReceiver,
-                callback);
+        if (cancel == null) {
+            throw new IllegalArgumentException("Must supply a cancellation signal");
+        }
+        if (executor == null) {
+            throw new IllegalArgumentException("Must supply an executor");
+        }
+        if (callback == null) {
+            throw new IllegalArgumentException("Must supply a callback");
+        }
+        authenticateInternal(crypto, cancel, executor, callback);
     }
 
     /**
@@ -462,34 +477,53 @@
     public void authenticate(@NonNull CancellationSignal cancel,
             @NonNull @CallbackExecutor Executor executor,
             @NonNull AuthenticationCallback callback) {
-        if (handlePreAuthenticationErrors(callback, executor)) {
-            return;
+        if (cancel == null) {
+            throw new IllegalArgumentException("Must supply a cancellation signal");
         }
-        mFingerprintManager.authenticate(cancel, mBundle, executor, mDialogReceiver, callback);
+        if (executor == null) {
+            throw new IllegalArgumentException("Must supply an executor");
+        }
+        if (callback == null) {
+            throw new IllegalArgumentException("Must supply a callback");
+        }
+        authenticateInternal(null /* crypto */, cancel, executor, callback);
     }
 
-    private boolean handlePreAuthenticationErrors(AuthenticationCallback callback,
-            Executor executor) {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
-            sendError(BiometricPrompt.BIOMETRIC_ERROR_HW_NOT_PRESENT, callback,
-                      executor);
-            return true;
-        } else if (!mFingerprintManager.isHardwareDetected()) {
-            sendError(BiometricPrompt.BIOMETRIC_ERROR_HW_UNAVAILABLE, callback,
-                      executor);
-            return true;
-        } else if (!mFingerprintManager.hasEnrolledFingerprints()) {
-            sendError(BiometricPrompt.BIOMETRIC_ERROR_NO_BIOMETRICS, callback,
-                      executor);
-            return true;
+    private void cancelAuthentication() {
+        if (mService != null) {
+            try {
+                mService.cancelAuthentication(mToken, mContext.getOpPackageName());
+            } catch (RemoteException e) {
+                Log.e(TAG, "Unable to cancel authentication", e);
+            }
         }
-        return false;
     }
 
-    private void sendError(int error, AuthenticationCallback callback, Executor executor) {
-        executor.execute(() -> {
-            callback.onAuthenticationError(error, mFingerprintManager.getErrorString(
-                    error, 0 /* vendorCode */));
-        });
+    private void authenticateInternal(@Nullable CryptoObject crypto,
+            @NonNull CancellationSignal cancel,
+            @NonNull @CallbackExecutor Executor executor,
+            @NonNull AuthenticationCallback callback) {
+        try {
+            if (cancel.isCanceled()) {
+                Log.w(TAG, "Authentication already canceled");
+                return;
+            } else {
+                cancel.setOnCancelListener(new OnAuthenticationCancelListener());
+            }
+
+            mCryptoObject = crypto;
+            mExecutor = executor;
+            mAuthenticationCallback = callback;
+            final long sessionId = crypto != null ? crypto.getOpId() : 0;
+            mService.authenticate(mToken, sessionId, mContext.getUserId(),
+                    mBiometricPromptServiceReceiver, 0 /* flags */, mContext.getOpPackageName(),
+                    mBundle, mDialogReceiver);
+        } catch (RemoteException e) {
+            Log.e(TAG, "Remote exception while authenticating", e);
+            mExecutor.execute(() -> {
+                callback.onAuthenticationError(BiometricPrompt.BIOMETRIC_ERROR_HW_UNAVAILABLE,
+                        mContext.getString(R.string.biometric_error_hw_unavailable));
+            });
+        }
     }
 }
diff --git a/core/java/android/hardware/biometrics/IBiometricPromptService.aidl b/core/java/android/hardware/biometrics/IBiometricPromptService.aidl
new file mode 100644
index 0000000..2c93579
--- /dev/null
+++ b/core/java/android/hardware/biometrics/IBiometricPromptService.aidl
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.biometrics;
+
+import android.os.Bundle;
+import android.hardware.biometrics.IBiometricPromptReceiver;
+import android.hardware.biometrics.IBiometricPromptServiceReceiver;
+
+/**
+ * Communication channel from BiometricPrompt to BiometricPromptService. The interface does not
+ * expose specific biometric modalities. The system will use the default biometric for apps. On
+ * devices with more than one, the choice is dictated by user preference in Settings.
+ * @hide
+ */
+interface IBiometricPromptService {
+    // Requests authentication. The service choose the appropriate biometric to use, and show
+    // the corresponding BiometricDialog.
+    void authenticate(IBinder token, long sessionId, int userId,
+            IBiometricPromptServiceReceiver receiver, int flags, String opPackageName,
+            in Bundle bundle, IBiometricPromptReceiver dialogReceiver);
+
+    // Cancel authentication for the given sessionId
+    void cancelAuthentication(IBinder token, String opPackageName);
+}
\ No newline at end of file
diff --git a/core/java/android/hardware/biometrics/IBiometricPromptServiceReceiver.aidl b/core/java/android/hardware/biometrics/IBiometricPromptServiceReceiver.aidl
new file mode 100644
index 0000000..1ef6c52
--- /dev/null
+++ b/core/java/android/hardware/biometrics/IBiometricPromptServiceReceiver.aidl
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.hardware.biometrics;
+
+import android.hardware.biometrics.BiometricSourceType;
+import android.os.Bundle;
+import android.os.UserHandle;
+
+/**
+ * Communication channel from the BiometricPromptService back to BiometricPrompt.
+ * @hide
+ */
+oneway interface IBiometricPromptServiceReceiver {
+    void onAuthenticationSucceeded(long deviceId);
+    void onAuthenticationFailed(long deviceId);
+    void onError(long deviceId, int error, String message);
+    void onAcquired(long deviceId, int acquiredInfo, String message);
+}
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java
index d51e896..e8fb287 100644
--- a/core/java/android/hardware/display/DisplayManager.java
+++ b/core/java/android/hardware/display/DisplayManager.java
@@ -167,8 +167,7 @@
      * reasonable measures, such as over-the-air encryption, to prevent the contents
      * of the display from being intercepted or recorded on a persistent medium.
      * </p><p>
-     * Creating a secure virtual display requires the
-     * {@link android.Manifest.permission#CAPTURE_SECURE_VIDEO_OUTPUT} permission.
+     * Creating a secure virtual display requires the CAPTURE_SECURE_VIDEO_OUTPUT permission.
      * This permission is reserved for use by system components and is not available to
      * third-party applications.
      * </p>
@@ -228,9 +227,8 @@
      * </p>
      *
      * <p>
-     * Creating an auto-mirroing virtual display requires the
-     * {@link android.Manifest.permission#CAPTURE_VIDEO_OUTPUT}
-     * or {@link android.Manifest.permission#CAPTURE_SECURE_VIDEO_OUTPUT} permission.
+     * Creating an auto-mirroing virtual display requires the CAPTURE_VIDEO_OUTPUT
+     * or CAPTURE_SECURE_VIDEO_OUTPUT permission.
      * These permissions are reserved for use by system components and are not available to
      * third-party applications.
      *
diff --git a/core/java/android/hardware/face/FaceManager.java b/core/java/android/hardware/face/FaceManager.java
index 6a3dd7d..0f83c8b 100644
--- a/core/java/android/hardware/face/FaceManager.java
+++ b/core/java/android/hardware/face/FaceManager.java
@@ -17,10 +17,9 @@
 package android.hardware.face;
 
 import static android.Manifest.permission.INTERACT_ACROSS_USERS;
-import static android.Manifest.permission.MANAGE_FACE;
-import static android.Manifest.permission.USE_BIOMETRIC;
+import static android.Manifest.permission.MANAGE_BIOMETRIC;
+import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;
 
-import android.annotation.CallbackExecutor;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
@@ -28,13 +27,11 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
+import android.hardware.biometrics.BiometricConstants;
 import android.hardware.biometrics.BiometricFaceConstants;
-import android.hardware.biometrics.BiometricPrompt;
 import android.hardware.biometrics.CryptoObject;
-import android.hardware.biometrics.IBiometricPromptReceiver;
 import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
 import android.os.Binder;
-import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.CancellationSignal.OnCancelListener;
 import android.os.Handler;
@@ -50,15 +47,13 @@
 import com.android.internal.R;
 
 import java.util.List;
-import java.util.concurrent.Executor;
 
 /**
  * A class that coordinates access to the face authentication hardware.
  * @hide
  */
 @SystemService(Context.FACE_SERVICE)
-public class FaceManager implements BiometricFaceConstants {
-
+public class FaceManager implements BiometricAuthenticator, BiometricFaceConstants {
 
     private static final String TAG = "FaceManager";
     private static final boolean DEBUG = true;
@@ -72,13 +67,12 @@
     private IFaceService mService;
     private final Context mContext;
     private IBinder mToken = new Binder();
-    private BiometricAuthenticator.AuthenticationCallback mAuthenticationCallback;
+    private AuthenticationCallback mAuthenticationCallback;
     private EnrollmentCallback mEnrollmentCallback;
     private RemovalCallback mRemovalCallback;
     private CryptoObject mCryptoObject;
     private Face mRemovalFace;
     private Handler mHandler;
-    private Executor mExecutor;
 
     private IFaceServiceReceiver mServiceReceiver = new IFaceServiceReceiver.Stub() {
 
@@ -147,7 +141,7 @@
      * @throws IllegalStateException    if the crypto primitive is not initialized.
      * @hide
      */
-    @RequiresPermission(USE_BIOMETRIC)
+    @RequiresPermission(USE_BIOMETRIC_INTERNAL)
     public void authenticate(@Nullable CryptoObject crypto, @Nullable CancellationSignal cancel,
             int flags, @NonNull AuthenticationCallback callback, @Nullable Handler handler) {
         if (callback == null) {
@@ -170,7 +164,7 @@
                 mCryptoObject = crypto;
                 long sessionId = crypto != null ? crypto.getOpId() : 0;
                 mService.authenticate(mToken, sessionId, mServiceReceiver, flags,
-                        mContext.getOpPackageName(), null /* bundle */, null /* receiver */);
+                        mContext.getOpPackageName());
             } catch (RemoteException e) {
                 Log.w(TAG, "Remote exception while authenticating: ", e);
                 if (callback != null) {
@@ -195,108 +189,6 @@
     }
 
     /**
-     * This method invokes the BiometricPrompt.
-     */
-    private void authenticateWithPrompt(@Nullable android.hardware.biometrics.CryptoObject crypto,
-            @NonNull CancellationSignal cancel,
-            @NonNull Bundle bundle,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull IBiometricPromptReceiver receiver,
-            @NonNull BiometricAuthenticator.AuthenticationCallback callback) {
-        mCryptoObject = crypto;
-        if (cancel.isCanceled()) {
-            Slog.w(TAG, "authentication already canceled");
-            return;
-        } else {
-            cancel.setOnCancelListener(new OnAuthenticationCancelListener(crypto));
-        }
-
-        if (mService != null) {
-            try {
-                mExecutor = executor;
-                mAuthenticationCallback = callback;
-                final long sessionId = crypto != null ? crypto.getOpId() : 0;
-                mService.authenticate(mToken, sessionId, mServiceReceiver,
-                        0 /* flags */, mContext.getOpPackageName(), bundle, receiver);
-            } catch (RemoteException e) {
-                Slog.w(TAG, "Remote exception while authenticating", e);
-                mExecutor.execute(() -> {
-                    callback.onAuthenticationError(FACE_ERROR_HW_UNAVAILABLE,
-                            getErrorString(FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */));
-                });
-            }
-        }
-    }
-
-    /**
-     * Private method, see {@link BiometricPrompt#authenticate(CancellationSignal, Executor,
-     * BiometricPrompt.AuthenticationCallback)}
-     * @param cancel
-     * @param executor
-     * @param callback
-     * @hide
-     */
-    public void authenticate(
-            @NonNull CancellationSignal cancel,
-            @NonNull Bundle bundle,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull IBiometricPromptReceiver receiver,
-            @NonNull BiometricAuthenticator.AuthenticationCallback callback) {
-        if (cancel == null) {
-            throw new IllegalArgumentException("Must supply a cancellation signal");
-        }
-        if (bundle == null) {
-            throw new IllegalArgumentException("Must supply a bundle");
-        }
-        if (executor == null) {
-            throw new IllegalArgumentException("Must supply an executor");
-        }
-        if (receiver == null) {
-            throw new IllegalArgumentException("Must supply a receiver");
-        }
-        if (callback == null) {
-            throw new IllegalArgumentException("Must supply a calback");
-        }
-        authenticateWithPrompt(null, cancel, bundle, executor, receiver, callback);
-    }
-
-    /**
-     * Private method, see {@link BiometricPrompt#authenticate(BiometricPrompt.CryptoObject,
-     * CancellationSignal, Executor, BiometricPrompt.AuthenticationCallback)}
-     * @param crypto
-     * @param cancel
-     * @param executor
-     * @param callback
-     * @hide
-     */
-    public void authenticate(@NonNull android.hardware.biometrics.CryptoObject crypto,
-            @NonNull CancellationSignal cancel,
-            @NonNull Bundle bundle,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull IBiometricPromptReceiver receiver,
-            @NonNull BiometricAuthenticator.AuthenticationCallback callback) {
-        if (crypto == null) {
-            throw new IllegalArgumentException("Must supply a crypto object");
-        }
-        if (cancel == null) {
-            throw new IllegalArgumentException("Must supply a cancellation signal");
-        }
-        if (bundle == null) {
-            throw new IllegalArgumentException("Must supply a bundle");
-        }
-        if (executor == null) {
-            throw new IllegalArgumentException("Must supply an executor");
-        }
-        if (receiver == null) {
-            throw new IllegalArgumentException("Must supply a receiver");
-        }
-        if (callback == null) {
-            throw new IllegalArgumentException("Must supply a callback");
-        }
-        authenticateWithPrompt(crypto, cancel, bundle, executor, receiver, callback);
-    }
-
-    /**
      * Request face authentication enrollment. This call operates the face authentication hardware
      * and starts capturing images. Progress will be indicated by callbacks to the
      * {@link EnrollmentCallback} object. It terminates when
@@ -313,7 +205,7 @@
      * @param callback an object to receive enrollment events
      * @hide
      */
-    @RequiresPermission(MANAGE_FACE)
+    @RequiresPermission(MANAGE_BIOMETRIC)
     public void enroll(byte[] token, CancellationSignal cancel, int flags,
             int userId, EnrollmentCallback callback) {
         if (userId == UserHandle.USER_CURRENT) {
@@ -355,7 +247,7 @@
      *
      * @hide
      */
-    @RequiresPermission(MANAGE_FACE)
+    @RequiresPermission(MANAGE_BIOMETRIC)
     public long preEnroll() {
         long result = 0;
         if (mService != null) {
@@ -373,7 +265,7 @@
      *
      * @hide
      */
-    @RequiresPermission(MANAGE_FACE)
+    @RequiresPermission(MANAGE_BIOMETRIC)
     public int postEnroll() {
         int result = 0;
         if (mService != null) {
@@ -392,7 +284,7 @@
      *
      * @hide
      */
-    @RequiresPermission(MANAGE_FACE)
+    @RequiresPermission(MANAGE_BIOMETRIC)
     public void setActiveUser(int userId) {
         if (mService != null) {
             try {
@@ -412,7 +304,7 @@
      *                 successfully removed. May be null if no callback is required.
      * @hide
      */
-    @RequiresPermission(MANAGE_FACE)
+    @RequiresPermission(MANAGE_BIOMETRIC)
     public void remove(Face face, int userId, RemovalCallback callback) {
         if (mService != null) {
             try {
@@ -435,7 +327,7 @@
      * @return the current face item
      * @hide
      */
-    @RequiresPermission(USE_BIOMETRIC)
+    @RequiresPermission(MANAGE_BIOMETRIC)
     public List<Face> getEnrolledFaces(int userId) {
         if (mService != null) {
             try {
@@ -453,7 +345,7 @@
      * @return the current face item
      * @hide
      */
-    @RequiresPermission(USE_BIOMETRIC)
+    @RequiresPermission(MANAGE_BIOMETRIC)
     public List<Face> getEnrolledFaces() {
         return getEnrolledFaces(UserHandle.myUserId());
     }
@@ -463,8 +355,9 @@
      *
      * @return true if a face is enrolled, false otherwise
      */
-    @RequiresPermission(USE_BIOMETRIC)
-    public boolean hasEnrolledFaces() {
+    @RequiresPermission(USE_BIOMETRIC_INTERNAL)
+    @Override
+    public boolean hasEnrolledTemplates() {
         if (mService != null) {
             try {
                 return mService.hasEnrolledFaces(
@@ -480,9 +373,9 @@
      * @hide
      */
     @RequiresPermission(allOf = {
-            USE_BIOMETRIC,
+            USE_BIOMETRIC_INTERNAL,
             INTERACT_ACROSS_USERS})
-    public boolean hasEnrolledFaces(int userId) {
+    public boolean hasEnrolledTemplates(int userId) {
         if (mService != null) {
             try {
                 return mService.hasEnrolledFaces(userId, mContext.getOpPackageName());
@@ -498,7 +391,8 @@
      *
      * @return true if hardware is present and functional, false otherwise.
      */
-    @RequiresPermission(USE_BIOMETRIC)
+    @RequiresPermission(USE_BIOMETRIC_INTERNAL)
+    @Override
     public boolean isHardwareDetected() {
         if (mService != null) {
             try {
@@ -538,6 +432,7 @@
      * @param token an opaque token returned by password confirmation.
      * @hide
      */
+    @RequiresPermission(MANAGE_BIOMETRIC)
     public void resetTimeout(byte[] token) {
         if (mService != null) {
             try {
@@ -553,6 +448,7 @@
     /**
      * @hide
      */
+    @RequiresPermission(USE_BIOMETRIC_INTERNAL)
     public void addLockoutResetCallback(final LockoutResetCallback callback) {
         if (mService != null) {
             try {
@@ -617,7 +513,8 @@
         }
     }
 
-    private String getErrorString(int errMsg, int vendorCode) {
+    @Override
+    public String getErrorString(int errMsg, int vendorCode) {
         switch (errMsg) {
             case FACE_ERROR_HW_UNAVAILABLE:
                 return mContext.getString(
@@ -652,7 +549,11 @@
         return null;
     }
 
-    private String getAcquiredString(int acquireInfo, int vendorCode) {
+    /**
+     * @hide
+     */
+    @Override
+    public String getAcquiredString(int acquireInfo, int vendorCode) {
         switch (acquireInfo) {
             case FACE_ACQUIRED_GOOD:
                 return null;
@@ -691,6 +592,45 @@
     }
 
     /**
+     * @hide
+     */
+    @Override
+    public int getType() {
+        return TYPE_FACE;
+    }
+
+    /**
+     * Used so BiometricPrompt can map the face ones onto existing public constants.
+     * @hide
+     */
+    public int getMappedAcquiredInfo(int acquireInfo, int vendorCode) {
+        switch (acquireInfo) {
+            case FACE_ACQUIRED_GOOD:
+                return BiometricConstants.BIOMETRIC_ACQUIRED_GOOD;
+            case FACE_ACQUIRED_INSUFFICIENT:
+            case FACE_ACQUIRED_TOO_BRIGHT:
+            case FACE_ACQUIRED_TOO_DARK:
+                return BiometricConstants.BIOMETRIC_ACQUIRED_INSUFFICIENT;
+            case FACE_ACQUIRED_TOO_CLOSE:
+            case FACE_ACQUIRED_TOO_FAR:
+            case FACE_ACQUIRED_TOO_HIGH:
+            case FACE_ACQUIRED_TOO_LOW:
+            case FACE_ACQUIRED_TOO_RIGHT:
+            case FACE_ACQUIRED_TOO_LEFT:
+                return BiometricConstants.BIOMETRIC_ACQUIRED_PARTIAL;
+            case FACE_ACQUIRED_POOR_GAZE:
+            case FACE_ACQUIRED_NOT_DETECTED:
+            case FACE_ACQUIRED_TOO_MUCH_MOTION:
+            case FACE_ACQUIRED_RECALIBRATE:
+                return BiometricConstants.BIOMETRIC_ACQUIRED_INSUFFICIENT;
+            case FACE_ACQUIRED_VENDOR:
+                return BiometricConstants.BIOMETRIC_ACQUIRED_VENDOR_BASE + vendorCode;
+            default:
+                return BiometricConstants.BIOMETRIC_ACQUIRED_GOOD;
+        }
+    }
+
+    /**
      * Container for callback data from {@link FaceManager#authenticate(CryptoObject,
      * CancellationSignal, int, AuthenticationCallback, Handler)}.
      */
@@ -796,18 +736,6 @@
          */
         public void onAuthenticationAcquired(int acquireInfo) {
         }
-
-        /**
-         * @hide
-         * @param result
-         */
-        @Override
-        public void onAuthenticationSucceeded(BiometricAuthenticator.AuthenticationResult result) {
-            onAuthenticationSucceeded(new AuthenticationResult(
-                    result.getCryptoObject(),
-                    (Face) result.getId(), result.getUserId()));
-        }
-
     }
 
     /**
@@ -988,8 +916,8 @@
 
     private void sendAuthenticatedSucceeded(Face face, int userId) {
         if (mAuthenticationCallback != null) {
-            final BiometricAuthenticator.AuthenticationResult result =
-                    new BiometricAuthenticator.AuthenticationResult(mCryptoObject, face, userId);
+            final AuthenticationResult result =
+                    new AuthenticationResult(mCryptoObject, face, userId);
             mAuthenticationCallback.onAuthenticationSucceeded(result);
         }
     }
diff --git a/core/java/android/hardware/face/IFaceService.aidl b/core/java/android/hardware/face/IFaceService.aidl
index 03bb7ae..dd995c9 100644
--- a/core/java/android/hardware/face/IFaceService.aidl
+++ b/core/java/android/hardware/face/IFaceService.aidl
@@ -17,23 +17,35 @@
 
 import android.os.Bundle;
 import android.hardware.biometrics.IBiometricPromptReceiver;
+import android.hardware.biometrics.IBiometricPromptServiceReceiver;
 import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
 import android.hardware.face.IFaceServiceReceiver;
 import android.hardware.face.Face;
 
 /**
- * Communication channel from client to the face service.
+ * Communication channel from client to the face service. These methods are all require the
+ * MANAGE_BIOMETRIC signature permission.
  * @hide
  */
 interface IFaceService {
     // Authenticate the given sessionId with a face
     void authenticate(IBinder token, long sessionId,
-            IFaceServiceReceiver receiver, int flags, String opPackageName,
-            in Bundle bundle, IBiometricPromptReceiver dialogReceiver);
+            IFaceServiceReceiver receiver, int flags, String opPackageName);
+
+    // This method invokes the BiometricDialog. The arguments are almost the same as above,
+    // but should only be called from (BiometricPromptService).
+    void authenticateFromService(IBinder token, long sessionId, int userId,
+            IBiometricPromptServiceReceiver receiver, int flags, String opPackageName,
+            in Bundle bundle, IBiometricPromptReceiver dialogReceiver,
+            int callingUid, int callingPid, int callingUserId);
 
     // Cancel authentication for the given sessionId
     void cancelAuthentication(IBinder token, String opPackageName);
 
+    // Same as above, with extra arguments.
+    void cancelAuthenticationFromService(IBinder token, String opPackageName,
+            int callingUid, int callingPid, int callingUserId);
+
     // Start face enrollment
     void enroll(IBinder token, in byte [] cryptoToken, int userId, IFaceServiceReceiver receiver,
                 int flags, String opPackageName);
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 15868f1..b380a2e 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -18,10 +18,10 @@
 
 import static android.Manifest.permission.INTERACT_ACROSS_USERS;
 import static android.Manifest.permission.MANAGE_FINGERPRINT;
+import static android.Manifest.permission.RESET_FINGERPRINT_LOCKOUT;
 import static android.Manifest.permission.USE_BIOMETRIC;
 import static android.Manifest.permission.USE_FINGERPRINT;
 
-import android.annotation.CallbackExecutor;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.RequiresFeature;
@@ -34,10 +34,8 @@
 import android.hardware.biometrics.BiometricAuthenticator;
 import android.hardware.biometrics.BiometricFingerprintConstants;
 import android.hardware.biometrics.BiometricPrompt;
-import android.hardware.biometrics.IBiometricPromptReceiver;
 import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
 import android.os.Binder;
-import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.CancellationSignal.OnCancelListener;
 import android.os.Handler;
@@ -66,7 +64,8 @@
 @Deprecated
 @SystemService(Context.FINGERPRINT_SERVICE)
 @RequiresFeature(PackageManager.FEATURE_FINGERPRINT)
-public class FingerprintManager implements BiometricFingerprintConstants {
+public class FingerprintManager implements BiometricAuthenticator, BiometricFingerprintConstants {
+
     private static final String TAG = "FingerprintManager";
     private static final boolean DEBUG = true;
     private static final int MSG_ENROLL_RESULT = 100;
@@ -80,14 +79,13 @@
     private IFingerprintService mService;
     private Context mContext;
     private IBinder mToken = new Binder();
-    private BiometricAuthenticator.AuthenticationCallback mAuthenticationCallback;
+    private AuthenticationCallback mAuthenticationCallback;
     private EnrollmentCallback mEnrollmentCallback;
     private RemovalCallback mRemovalCallback;
     private EnumerateCallback mEnumerateCallback;
-    private android.hardware.biometrics.CryptoObject mCryptoObject;
+    private CryptoObject mCryptoObject;
     private Fingerprint mRemovalFingerprint;
     private Handler mHandler;
-    private Executor mExecutor;
 
     private class OnEnrollCancelListener implements OnCancelListener {
         @Override
@@ -250,24 +248,12 @@
          */
         @Override
         public void onAuthenticationAcquired(int acquireInfo) {}
-
-        /**
-         * @hide
-         * @param result
-         */
-        @Override
-        public void onAuthenticationSucceeded(BiometricAuthenticator.AuthenticationResult result) {
-            onAuthenticationSucceeded(new AuthenticationResult(
-                    (CryptoObject) result.getCryptoObject(),
-                    (Fingerprint) result.getId(), result.getUserId()));
-        }
     };
 
     /**
-     * Callback structure provided to {@link FingerprintManager#enroll(long, EnrollmentCallback,
-     * CancellationSignal, int). Users of {@link #FingerprintManager()}
-     * must provide an implementation of this to {@link FingerprintManager#enroll(long,
-     * CancellationSignal, int, EnrollmentCallback) for listening to fingerprint events.
+     * Callback structure provided to {@link FingerprintManager#enroll(byte[], CancellationSignal,
+     * int, int, EnrollmentCallback)} must provide an implementation of this for listening to
+     * fingerprint events.
      *
      * @hide
      */
@@ -328,9 +314,9 @@
     };
 
     /**
-     * Callback structure provided to {@link FingerprintManager#enumerate(int). Users of
-     * {@link #FingerprintManager()} may optionally provide an implementation of this to
-     * {@link FingerprintManager#enumerate(int, int, EnumerateCallback)} for listening to
+     * Callback structure provided to {@link FingerprintManager#enumerate(int, EnumerateCallback)}.
+     * Users of{@link #FingerprintManager} may optionally provide an implementation of this to
+     * {@link FingerprintManager#enumerate(int, EnumerateCallback)} for listening to
      * fingerprint template removal events.
      *
      * @hide
@@ -433,7 +419,7 @@
             mCryptoObject = crypto;
             long sessionId = crypto != null ? crypto.getOpId() : 0;
             mService.authenticate(mToken, sessionId, userId, mServiceReceiver, flags,
-                    mContext.getOpPackageName(), null /* bundle */, null /* receiver */);
+                    mContext.getOpPackageName());
         } catch (RemoteException e) {
             Slog.w(TAG, "Remote exception while authenticating: ", e);
             if (callback != null) {
@@ -446,110 +432,6 @@
     }
 
     /**
-     * Per-user version. This method invokes the BiometricPrompt.
-     */
-    private void authenticate(int userId,
-            @Nullable android.hardware.biometrics.CryptoObject crypto,
-            @NonNull CancellationSignal cancel,
-            @NonNull Bundle bundle,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull IBiometricPromptReceiver receiver,
-            @NonNull BiometricAuthenticator.AuthenticationCallback callback) {
-        mCryptoObject = crypto;
-        if (cancel.isCanceled()) {
-            Slog.w(TAG, "authentication already canceled");
-            return;
-        } else {
-            cancel.setOnCancelListener(new OnAuthenticationCancelListener(crypto));
-        }
-
-        if (mService != null) {
-            try {
-                mExecutor = executor;
-                mAuthenticationCallback = callback;
-                final long sessionId = crypto != null ? crypto.getOpId() : 0;
-                mService.authenticate(mToken, sessionId, userId, mServiceReceiver,
-                        0 /* flags */, mContext.getOpPackageName(), bundle, receiver);
-            } catch (RemoteException e) {
-                Slog.w(TAG, "Remote exception while authenticating", e);
-                mExecutor.execute(() -> {
-                    callback.onAuthenticationError(FINGERPRINT_ERROR_HW_UNAVAILABLE,
-                            getErrorString(FINGERPRINT_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */));
-                });
-            }
-        }
-    }
-
-    /**
-     * Private method, see {@link BiometricPrompt#authenticate(CancellationSignal, Executor,
-     * BiometricPrompt.AuthenticationCallback)}
-     * @param cancel
-     * @param executor
-     * @param callback
-     * @hide
-     */
-    public void authenticate(
-            @NonNull CancellationSignal cancel,
-            @NonNull Bundle bundle,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull IBiometricPromptReceiver receiver,
-            @NonNull BiometricAuthenticator.AuthenticationCallback callback) {
-        if (cancel == null) {
-            throw new IllegalArgumentException("Must supply a cancellation signal");
-        }
-        if (bundle == null) {
-            throw new IllegalArgumentException("Must supply a bundle");
-        }
-        if (executor == null) {
-            throw new IllegalArgumentException("Must supply an executor");
-        }
-        if (receiver == null) {
-            throw new IllegalArgumentException("Must supply a receiver");
-        }
-        if (callback == null) {
-            throw new IllegalArgumentException("Must supply a calback");
-        }
-        authenticate(mContext.getUserId(), null, cancel, bundle, executor, receiver, callback);
-    }
-
-    /**
-     * Private method, see {@link BiometricPrompt#authenticate(BiometricPrompt.CryptoObject,
-     * CancellationSignal, Executor, BiometricPrompt.AuthenticationCallback)}
-     * @param crypto
-     * @param cancel
-     * @param executor
-     * @param callback
-     * @hide
-     */
-    public void authenticate(@NonNull android.hardware.biometrics.CryptoObject crypto,
-            @NonNull CancellationSignal cancel,
-            @NonNull Bundle bundle,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull IBiometricPromptReceiver receiver,
-            @NonNull BiometricAuthenticator.AuthenticationCallback callback) {
-        if (crypto == null) {
-            throw new IllegalArgumentException("Must supply a crypto object");
-        }
-        if (cancel == null) {
-            throw new IllegalArgumentException("Must supply a cancellation signal");
-        }
-        if (bundle == null) {
-            throw new IllegalArgumentException("Must supply a bundle");
-        }
-        if (executor == null) {
-            throw new IllegalArgumentException("Must supply an executor");
-        }
-        if (receiver == null) {
-            throw new IllegalArgumentException("Must supply a receiver");
-        }
-        if (callback == null) {
-            throw new IllegalArgumentException("Must supply a callback");
-        }
-        authenticate(mContext.getUserId(), crypto, cancel,
-                bundle, executor, receiver, callback);
-    }
-
-    /**
      * Request fingerprint enrollment. This call warms up the fingerprint hardware
      * and starts scanning for fingerprints. Progress will be indicated by callbacks to the
      * {@link EnrollmentCallback} object. It terminates when
@@ -743,6 +625,14 @@
     }
 
     /**
+     * @hide
+     */
+    @Override
+    public boolean hasEnrolledTemplates() {
+        return hasEnrolledFingerprints();
+    }
+
+    /**
      * Determine if there is at least one fingerprint enrolled.
      *
      * @return true if at least one fingerprint is enrolled, false otherwise
@@ -785,6 +675,7 @@
      */
     @Deprecated
     @RequiresPermission(USE_FINGERPRINT)
+    @Override
     public boolean isHardwareDetected() {
         if (mService != null) {
             try {
@@ -826,6 +717,7 @@
      *
      * @hide
      */
+    @RequiresPermission(RESET_FINGERPRINT_LOCKOUT)
     public void resetTimeout(byte[] token) {
         if (mService != null) {
             try {
@@ -954,8 +846,8 @@
 
     private void sendAuthenticatedSucceeded(Fingerprint fp, int userId) {
         if (mAuthenticationCallback != null) {
-            final BiometricAuthenticator.AuthenticationResult result =
-                    new BiometricAuthenticator.AuthenticationResult(mCryptoObject, fp, userId);
+            final AuthenticationResult result =
+                    new AuthenticationResult(mCryptoObject, fp, userId);
             mAuthenticationCallback.onAuthenticationSucceeded(result);
         }
     }
@@ -1042,6 +934,7 @@
     /**
      * @hide
      */
+    @Override
     public String getErrorString(int errMsg, int vendorCode) {
         switch (errMsg) {
             case FINGERPRINT_ERROR_UNABLE_TO_PROCESS:
@@ -1086,6 +979,7 @@
     /**
      * @hide
      */
+    @Override
     public String getAcquiredString(int acquireInfo, int vendorCode) {
         switch (acquireInfo) {
             case FINGERPRINT_ACQUIRED_GOOD:
@@ -1117,6 +1011,14 @@
         return null;
     }
 
+    /**
+     * @hide
+     */
+    @Override
+    public int getType() {
+        return TYPE_FINGERPRINT;
+    }
+
     private IFingerprintServiceReceiver mServiceReceiver = new IFingerprintServiceReceiver.Stub() {
 
         @Override // binder call
@@ -1127,47 +1029,23 @@
 
         @Override // binder call
         public void onAcquired(long deviceId, int acquireInfo, int vendorCode) {
-            if (mExecutor != null) {
-                mExecutor.execute(() -> {
-                    sendAcquiredResult(deviceId, acquireInfo, vendorCode);
-                });
-            } else {
-                mHandler.obtainMessage(MSG_ACQUIRED, acquireInfo, vendorCode,
-                        deviceId).sendToTarget();
-            }
+            mHandler.obtainMessage(MSG_ACQUIRED, acquireInfo, vendorCode,
+                    deviceId).sendToTarget();
         }
 
         @Override // binder call
         public void onAuthenticationSucceeded(long deviceId, Fingerprint fp, int userId) {
-            if (mExecutor != null) {
-                mExecutor.execute(() -> {
-                    sendAuthenticatedSucceeded(fp, userId);
-                });
-            } else {
-                mHandler.obtainMessage(MSG_AUTHENTICATION_SUCCEEDED, userId, 0, fp).sendToTarget();
-            }
+            mHandler.obtainMessage(MSG_AUTHENTICATION_SUCCEEDED, userId, 0, fp).sendToTarget();
         }
 
         @Override // binder call
         public void onAuthenticationFailed(long deviceId) {
-            if (mExecutor != null) {
-                mExecutor.execute(() -> {
-                    sendAuthenticatedFailed();
-                });
-            } else {
-                mHandler.obtainMessage(MSG_AUTHENTICATION_FAILED).sendToTarget();
-            }
+            mHandler.obtainMessage(MSG_AUTHENTICATION_FAILED).sendToTarget();
         }
 
         @Override // binder call
         public void onError(long deviceId, int error, int vendorCode) {
-            if (mExecutor != null) {
-                mExecutor.execute(() -> {
-                    sendErrorResult(deviceId, error, vendorCode);
-                });
-            } else {
-                mHandler.obtainMessage(MSG_ERROR, error, vendorCode, deviceId).sendToTarget();
-            }
+            mHandler.obtainMessage(MSG_ERROR, error, vendorCode, deviceId).sendToTarget();
         }
 
         @Override // binder call
diff --git a/core/java/android/hardware/fingerprint/IFingerprintService.aidl b/core/java/android/hardware/fingerprint/IFingerprintService.aidl
index 71a6420..2b2c0b7 100644
--- a/core/java/android/hardware/fingerprint/IFingerprintService.aidl
+++ b/core/java/android/hardware/fingerprint/IFingerprintService.aidl
@@ -17,6 +17,7 @@
 
 import android.os.Bundle;
 import android.hardware.biometrics.IBiometricPromptReceiver;
+import android.hardware.biometrics.IBiometricPromptServiceReceiver;
 import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
 import android.hardware.fingerprint.IFingerprintClientActiveCallback;
 import android.hardware.fingerprint.IFingerprintServiceReceiver;
@@ -28,14 +29,29 @@
  * @hide
  */
 interface IFingerprintService {
-    // Authenticate the given sessionId with a fingerprint
+    // Authenticate the given sessionId with a fingerprint. This is protected by
+    // USE_FINGERPRINT/USE_BIOMETRIC permission. This is effectively deprecated, since it only comes
+    // through FingerprintManager now.
     void authenticate(IBinder token, long sessionId, int userId,
-            IFingerprintServiceReceiver receiver, int flags, String opPackageName,
-            in Bundle bundle, IBiometricPromptReceiver dialogReceiver);
+            IFingerprintServiceReceiver receiver, int flags, String opPackageName);
+
+    // This method invokes the BiometricDialog. The arguments are almost the same as above, except
+    // this is protected by the MANAGE_BIOMETRIC signature permission. This method should only be
+    // called from BiometricPromptService. The additional uid, pid, userId arguments should be
+    // determined by BiometricPromptService.
+    void authenticateFromService(IBinder token, long sessionId, int userId,
+            IBiometricPromptServiceReceiver receiver, int flags, String opPackageName,
+            in Bundle bundle, IBiometricPromptReceiver dialogReceiver,
+            int callingUid, int callingPid, int callingUserId);
 
     // Cancel authentication for the given sessionId
     void cancelAuthentication(IBinder token, String opPackageName);
 
+    // Same as above, except this is protected by the MANAGE_BIOMETRIC signature permission. Takes
+    // an additional uid, pid, userid.
+    void cancelAuthenticationFromService(IBinder token, String opPackageName,
+            int callingUid, int callingPid, int callingUserId);
+
     // Start fingerprint enrollment
     void enroll(IBinder token, in byte [] cryptoToken, int groupId, IFingerprintServiceReceiver receiver,
             int flags, String opPackageName);
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index fb916d3..ce18796 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -3840,7 +3840,7 @@
     @UnsupportedAppUsage
     public static boolean setProcessDefaultNetworkForHostResolution(Network network) {
         return NetworkUtils.bindProcessToNetworkForHostResolution(
-                network == null ? NETID_UNSET : network.netId);
+                (network == null) ? NETID_UNSET : network.getNetIdForResolv());
     }
 
     /**
diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java
index 142023d..bf2344d 100644
--- a/core/java/android/net/Network.java
+++ b/core/java/android/net/Network.java
@@ -100,21 +100,29 @@
     // anytime and (b) receivers should be explicit about attempts to bypass
     // Private DNS so that the intent of the code is easily determined and
     // code search audits are possible.
-    private boolean mPrivateDnsBypass = false;
+    private final transient boolean mPrivateDnsBypass;
 
     /**
      * @hide
      */
     @UnsupportedAppUsage
     public Network(int netId) {
+        this(netId, false);
+    }
+
+    /**
+     * @hide
+     */
+    public Network(int netId, boolean privateDnsBypass) {
         this.netId = netId;
+        this.mPrivateDnsBypass = privateDnsBypass;
     }
 
     /**
      * @hide
      */
     public Network(Network that) {
-        this.netId = that.netId;
+        this(that.netId, that.mPrivateDnsBypass);
     }
 
     /**
@@ -133,8 +141,7 @@
      * Operates the same as {@code InetAddress.getByName} except that host
      * resolution is done on this network.
      *
-     * @param host
-     *            the hostName to be resolved to an address or {@code null}.
+     * @param host the hostname to be resolved to an address or {@code null}.
      * @return the {@code InetAddress} instance representing the host.
      * @throws UnknownHostException
      *             if the address lookup fails.
@@ -144,14 +151,14 @@
     }
 
     /**
-     * Specify whether or not Private DNS should be bypassed when attempting
+     * Obtain a Network object for which Private DNS is to be bypassed when attempting
      * to use {@link #getAllByName(String)}/{@link #getByName(String)} methods on the given
      * instance for hostname resolution.
      *
      * @hide
      */
-    public void setPrivateDnsBypass(boolean bypass) {
-        mPrivateDnsBypass = bypass;
+    public Network getPrivateDnsBypassingCopy() {
+        return new Network(netId, true);
     }
 
     /**
diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS
index fee91fb..15f4913 100644
--- a/core/java/android/net/OWNERS
+++ b/core/java/android/net/OWNERS
@@ -9,12 +9,4 @@
 satk@google.com
 silberst@google.com
 
-per-file SSL*=flooey@google.com
-per-file SSL*=narayan@google.com
-per-file SSL*=tobiast@google.com
-per-file Uri*=flooey@google.com
-per-file Uri*=narayan@google.com
-per-file Uri*=tobiast@google.com
-per-file Url*=flooey@google.com
-per-file Url*=narayan@google.com
-per-file Url*=tobiast@google.com
+per-file SSL*, Uri*, Url* = flooey@google.com, narayan@google.com, tobiast@google.com
diff --git a/core/java/android/net/SntpClient.java b/core/java/android/net/SntpClient.java
index 10c0ce2..b8d7cf1 100644
--- a/core/java/android/net/SntpClient.java
+++ b/core/java/android/net/SntpClient.java
@@ -85,19 +85,16 @@
      * @return true if the transaction was successful.
      */
     public boolean requestTime(String host, int timeout, Network network) {
-        // This flag only affects DNS resolution and not other socket semantics,
-        // therefore it's safe to set unilaterally rather than take more
-        // defensive measures like making a copy.
-        network.setPrivateDnsBypass(true);
+        final Network networkForResolv = network.getPrivateDnsBypassingCopy();
         InetAddress address = null;
         try {
-            address = network.getByName(host);
+            address = networkForResolv.getByName(host);
         } catch (Exception e) {
             EventLogTags.writeNtpFailure(host, e.toString());
             if (DBG) Log.d(TAG, "request time failed: " + e);
             return false;
         }
-        return requestTime(address, NTP_PORT, timeout, network);
+        return requestTime(address, NTP_PORT, timeout, networkForResolv);
     }
 
     public boolean requestTime(InetAddress address, int port, int timeout, Network network) {
diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java
index a463afa..22dd4fc 100644
--- a/core/java/android/net/TrafficStats.java
+++ b/core/java/android/net/TrafficStats.java
@@ -139,6 +139,8 @@
     public static final int TAG_SYSTEM_GPS = 0xFFFFFF44;
     /** @hide */
     public static final int TAG_SYSTEM_PAC = 0xFFFFFF45;
+    /** @hide */
+    public static final int TAG_SYSTEM_DHCP_SERVER = 0xFFFFFF46;
 
     private static INetworkStatsService sStatsService;
 
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index 6ddcbe0..aba81af 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -321,6 +321,45 @@
         }
 
         /**
+         * @hide Copy contents from another object.
+         */
+        public void set(MemoryInfo other) {
+            dalvikPss = other.dalvikPss;
+            dalvikSwappablePss = other.dalvikSwappablePss;
+            dalvikRss = other.dalvikRss;
+            dalvikPrivateDirty = other.dalvikPrivateDirty;
+            dalvikSharedDirty = other.dalvikSharedDirty;
+            dalvikPrivateClean = other.dalvikPrivateClean;
+            dalvikSharedClean = other.dalvikSharedClean;
+            dalvikSwappedOut = other.dalvikSwappedOut;
+            dalvikSwappedOutPss = other.dalvikSwappedOutPss;
+
+            nativePss = other.nativePss;
+            nativeSwappablePss = other.nativeSwappablePss;
+            nativeRss = other.nativeRss;
+            nativePrivateDirty = other.nativePrivateDirty;
+            nativeSharedDirty = other.nativeSharedDirty;
+            nativePrivateClean = other.nativePrivateClean;
+            nativeSharedClean = other.nativeSharedClean;
+            nativeSwappedOut = other.nativeSwappedOut;
+            nativeSwappedOutPss = other.nativeSwappedOutPss;
+
+            otherPss = other.otherPss;
+            otherSwappablePss = other.otherSwappablePss;
+            otherRss = other.otherRss;
+            otherPrivateDirty = other.otherPrivateDirty;
+            otherSharedDirty = other.otherSharedDirty;
+            otherPrivateClean = other.otherPrivateClean;
+            otherSharedClean = other.otherSharedClean;
+            otherSwappedOut = other.otherSwappedOut;
+            otherSwappedOutPss = other.otherSwappedOutPss;
+
+            hasSwappedOutPss = other.hasSwappedOutPss;
+
+            System.arraycopy(other.otherStats, 0, otherStats, 0, otherStats.length);
+        }
+
+        /**
          * Return total PSS memory usage in kB.
          */
         public int getTotalPss() {
diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java
index 3a3d9ea..1c8029c 100644
--- a/core/java/android/os/FileUtils.java
+++ b/core/java/android/os/FileUtils.java
@@ -23,6 +23,7 @@
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.content.ContentResolver;
 import android.provider.DocumentsContract.Document;
 import android.system.ErrnoException;
 import android.system.Os;
@@ -1057,7 +1058,7 @@
             }
 
             if (mimeTypeFromExt == null) {
-                mimeTypeFromExt = "application/octet-stream";
+                mimeTypeFromExt = ContentResolver.MIME_TYPE_DEFAULT;
             }
 
             final String extFromMimeType = MimeTypeMap.getSingleton().getExtensionFromMimeType(
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 7e7666a..cc6bb12 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -846,11 +846,19 @@
             return;
         }
         Set<Map.Entry<String,Object>> entries = val.entrySet();
-        writeInt(entries.size());
+        int size = entries.size();
+        writeInt(size);
+
         for (Map.Entry<String,Object> e : entries) {
             writeValue(e.getKey());
             writeValue(e.getValue());
+            size--;
         }
+
+        if (size != 0) {
+            throw new BadParcelableException("Map size does not match number of entries!");
+        }
+
     }
 
     /**
diff --git a/core/java/android/os/StatsLogEventWrapper.java b/core/java/android/os/StatsLogEventWrapper.java
index d4d3dc8..7b3ea57 100644
--- a/core/java/android/os/StatsLogEventWrapper.java
+++ b/core/java/android/os/StatsLogEventWrapper.java
@@ -65,11 +65,17 @@
     public static final Parcelable.Creator<StatsLogEventWrapper> CREATOR = new
             Parcelable.Creator<StatsLogEventWrapper>() {
                 public StatsLogEventWrapper createFromParcel(Parcel in) {
-                    return new StatsLogEventWrapper(in);
+                    android.util.EventLog.writeEvent(0x534e4554, "112550251",
+                            android.os.Binder.getCallingUid(), "");
+                    // Purposefully leaving this method not implemented.
+                    throw new RuntimeException("Not implemented");
                 }
 
                 public StatsLogEventWrapper[] newArray(int size) {
-                    return new StatsLogEventWrapper[size];
+                    android.util.EventLog.writeEvent(0x534e4554, "112550251",
+                            android.os.Binder.getCallingUid(), "");
+                    // Purposefully leaving this method not implemented.
+                    throw new RuntimeException("Not implemented");
                 }
             };
 
@@ -120,10 +126,6 @@
         mStorage.write(bytes, 0, bytes.length);
     }
 
-    private StatsLogEventWrapper(Parcel in) {
-        readFromParcel(in);
-    }
-
     /**
      * Writes the stored fields to a byte array. Will first write a new-line character to denote
      * END_LIST before writing contents to byte array.
@@ -134,13 +136,6 @@
     }
 
     /**
-     * Not implemented.
-     */
-    public void readFromParcel(Parcel in) {
-        // Not needed since this java class is for sending to statsd only.
-    }
-
-    /**
      * Boilerplate for Parcel.
      */
     public int describeContents() {
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index 66ebbdb..995156a 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -57,6 +57,7 @@
     public static final UserHandle CURRENT_OR_SELF = new UserHandle(USER_CURRENT_OR_SELF);
 
     /** @hide An undefined user id */
+    @SystemApi
     public static final @UserIdInt int USER_NULL = -10000;
 
     /**
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 7a214b1..b0891050 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -2343,7 +2343,10 @@
      *
      * @hide
      */
-    public int[] getProfileIds(@UserIdInt int userId, boolean enabledOnly) {
+    @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,
+            Manifest.permission.CREATE_USERS}, conditional = true)
+    @SystemApi
+    public @NonNull int[] getProfileIds(@UserIdInt int userId, boolean enabledOnly) {
         try {
             return mService.getProfileIds(userId, enabledOnly);
         } catch (RemoteException re) {
diff --git a/core/java/android/os/health/SystemHealthManager.java b/core/java/android/os/health/SystemHealthManager.java
index bba4cd1..f303674 100644
--- a/core/java/android/os/health/SystemHealthManager.java
+++ b/core/java/android/os/health/SystemHealthManager.java
@@ -17,6 +17,7 @@
 package android.os.health;
 
 import android.annotation.SystemService;
+import android.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.os.BatteryStats;
 import android.os.Process;
@@ -49,6 +50,7 @@
      * Construct a new SystemHealthManager object.
      * @hide
      */
+    @UnsupportedAppUsage
     public SystemHealthManager() {
         this(IBatteryStats.Stub.asInterface(ServiceManager.getService(BatteryStats.SERVICE_NAME)));
     }
@@ -63,6 +65,7 @@
      *
      * @hide
      */
+    @UnsupportedAppUsage
     public static SystemHealthManager from(Context context) {
         return (SystemHealthManager)context.getSystemService(Context.SYSTEM_HEALTH_SERVICE);
     }
diff --git a/core/java/android/os/storage/DiskInfo.java b/core/java/android/os/storage/DiskInfo.java
index d493cce..7b6c971 100644
--- a/core/java/android/os/storage/DiskInfo.java
+++ b/core/java/android/os/storage/DiskInfo.java
@@ -18,6 +18,7 @@
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.UnsupportedAppUsage;
 import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -50,8 +51,11 @@
     public static final int FLAG_USB = 1 << 3;
 
     public final String id;
+    @UnsupportedAppUsage
     public final int flags;
+    @UnsupportedAppUsage
     public long size;
+    @UnsupportedAppUsage
     public String label;
     /** Hacky; don't rely on this count */
     public int volumeCount;
@@ -62,6 +66,7 @@
         this.flags = flags;
     }
 
+    @UnsupportedAppUsage
     public DiskInfo(Parcel parcel) {
         id = parcel.readString();
         flags = parcel.readInt();
@@ -71,6 +76,7 @@
         sysPath = parcel.readString();
     }
 
+    @UnsupportedAppUsage
     public @NonNull String getId() {
         return id;
     }
@@ -94,6 +100,7 @@
         return true;
     }
 
+    @UnsupportedAppUsage
     public @Nullable String getDescription() {
         final Resources res = Resources.getSystem();
         if ((flags & FLAG_SD) != 0) {
@@ -124,18 +131,22 @@
         }
     }
 
+    @UnsupportedAppUsage
     public boolean isAdoptable() {
         return (flags & FLAG_ADOPTABLE) != 0;
     }
 
+    @UnsupportedAppUsage
     public boolean isDefaultPrimary() {
         return (flags & FLAG_DEFAULT_PRIMARY) != 0;
     }
 
+    @UnsupportedAppUsage
     public boolean isSd() {
         return (flags & FLAG_SD) != 0;
     }
 
+    @UnsupportedAppUsage
     public boolean isUsb() {
         return (flags & FLAG_USB) != 0;
     }
@@ -185,6 +196,7 @@
         return id.hashCode();
     }
 
+    @UnsupportedAppUsage
     public static final Creator<DiskInfo> CREATOR = new Creator<DiskInfo>() {
         @Override
         public DiskInfo createFromParcel(Parcel in) {
diff --git a/core/java/android/os/storage/IStorageManager.aidl b/core/java/android/os/storage/IStorageManager.aidl
index 5c2d41e..33b2676 100644
--- a/core/java/android/os/storage/IStorageManager.aidl
+++ b/core/java/android/os/storage/IStorageManager.aidl
@@ -17,6 +17,7 @@
 package android.os.storage;
 
 import android.content.pm.IPackageMoveObserver;
+import android.content.res.ObbInfo;
 import android.os.IVoldTaskListener;
 import android.os.ParcelFileDescriptor;
 import android.os.storage.DiskInfo;
@@ -57,7 +58,7 @@
      * it of the terminal state of the call.
      */
     void mountObb(in String rawPath, in String canonicalPath, in String key,
-            IObbActionListener token, int nonce) = 21;
+            IObbActionListener token, int nonce, in ObbInfo obbInfo) = 21;
     /**
      * Unmounts an Opaque Binary Blob (OBB). When the force flag is specified,
      * any program using it will be forcibly killed to unmount the image.
diff --git a/core/java/android/os/storage/StorageEventListener.java b/core/java/android/os/storage/StorageEventListener.java
index 4cf83fd..4aa0b08 100644
--- a/core/java/android/os/storage/StorageEventListener.java
+++ b/core/java/android/os/storage/StorageEventListener.java
@@ -16,6 +16,8 @@
 
 package android.os.storage;
 
+import android.annotation.UnsupportedAppUsage;
+
 /**
  * Used for receiving notifications from the StorageManager
  * 
@@ -26,6 +28,7 @@
      * Called when the detection state of a USB Mass Storage host has changed.
      * @param connected true if the USB mass storage is connected.
      */
+    @UnsupportedAppUsage
     public void onUsbMassStorageConnectionChanged(boolean connected) {
     }
 
@@ -35,21 +38,27 @@
      * @param oldState the old state as returned by {@link android.os.Environment#getExternalStorageState()}.
      * @param newState the old state as returned by {@link android.os.Environment#getExternalStorageState()}.
      */
+    @UnsupportedAppUsage
     public void onStorageStateChanged(String path, String oldState, String newState) {
     }
 
+    @UnsupportedAppUsage
     public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
     }
 
+    @UnsupportedAppUsage
     public void onVolumeRecordChanged(VolumeRecord rec) {
     }
 
+    @UnsupportedAppUsage
     public void onVolumeForgotten(String fsUuid) {
     }
 
+    @UnsupportedAppUsage
     public void onDiskScanned(DiskInfo disk, int volumeCount) {
     }
 
+    @UnsupportedAppUsage
     public void onDiskDestroyed(DiskInfo disk) {
     }
 }
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 5a1ea68..8d5017b 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -25,6 +25,7 @@
 import android.annotation.SuppressLint;
 import android.annotation.SystemApi;
 import android.annotation.SystemService;
+import android.annotation.UnsupportedAppUsage;
 import android.annotation.WorkerThread;
 import android.app.Activity;
 import android.app.ActivityThread;
@@ -34,10 +35,13 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageMoveObserver;
 import android.content.pm.PackageManager;
+import android.content.res.ObbInfo;
+import android.content.res.ObbScanner;
 import android.os.Binder;
 import android.os.Environment;
 import android.os.FileUtils;
 import android.os.Handler;
+import android.os.IInstalld;
 import android.os.IVold;
 import android.os.IVoldTaskListener;
 import android.os.Looper;
@@ -213,11 +217,10 @@
     /** {@hide} */
     public static final int DEBUG_VIRTUAL_DISK = 1 << 5;
 
-    // NOTE: keep in sync with installd
     /** {@hide} */
-    public static final int FLAG_STORAGE_DE = 1 << 0;
+    public static final int FLAG_STORAGE_DE = IInstalld.FLAG_STORAGE_DE;
     /** {@hide} */
-    public static final int FLAG_STORAGE_CE = 1 << 1;
+    public static final int FLAG_STORAGE_CE = IInstalld.FLAG_STORAGE_CE;
 
     /** {@hide} */
     public static final int FLAG_FOR_WRITE = 1 << 8;
@@ -230,6 +233,7 @@
     public static final int FSTRIM_FLAG_DEEP = IVold.FSTRIM_FLAG_DEEP_TRIM;
 
     /** @hide The volume is not encrypted. */
+    @UnsupportedAppUsage
     public static final int ENCRYPTION_STATE_NONE =
             IVold.ENCRYPTION_STATE_NONE;
 
@@ -446,6 +450,7 @@
 
     /** {@hide} */
     @Deprecated
+    @UnsupportedAppUsage
     public static StorageManager from(Context context) {
         return context.getSystemService(StorageManager.class);
     }
@@ -462,6 +467,7 @@
      *
      * @hide
      */
+    @UnsupportedAppUsage
     public StorageManager(Context context, Looper looper) throws ServiceNotFoundException {
         mContext = context;
         mResolver = context.getContentResolver();
@@ -476,6 +482,7 @@
      *
      * @hide
      */
+    @UnsupportedAppUsage
     public void registerListener(StorageEventListener listener) {
         synchronized (mDelegates) {
             final StorageEventListenerDelegate delegate = new StorageEventListenerDelegate(listener,
@@ -496,6 +503,7 @@
      *
      * @hide
      */
+    @UnsupportedAppUsage
     public void unregisterListener(StorageEventListener listener) {
         synchronized (mDelegates) {
             for (Iterator<StorageEventListenerDelegate> i = mDelegates.iterator(); i.hasNext();) {
@@ -518,6 +526,7 @@
      * @hide
      */
     @Deprecated
+    @UnsupportedAppUsage
     public void enableUsbMassStorage() {
     }
 
@@ -527,6 +536,7 @@
      * @hide
      */
     @Deprecated
+    @UnsupportedAppUsage
     public void disableUsbMassStorage() {
     }
 
@@ -537,6 +547,7 @@
      * @hide
      */
     @Deprecated
+    @UnsupportedAppUsage
     public boolean isUsbMassStorageConnected() {
         return false;
     }
@@ -548,6 +559,7 @@
      * @hide
      */
     @Deprecated
+    @UnsupportedAppUsage
     public boolean isUsbMassStorageEnabled() {
         return false;
     }
@@ -580,7 +592,8 @@
         try {
             final String canonicalPath = new File(rawPath).getCanonicalPath();
             final int nonce = mObbActionListener.addListener(listener);
-            mStorageManager.mountObb(rawPath, canonicalPath, key, mObbActionListener, nonce);
+            mStorageManager.mountObb(rawPath, canonicalPath, key, mObbActionListener, nonce,
+                    getObbInfo(canonicalPath));
             return true;
         } catch (IOException e) {
             throw new IllegalArgumentException("Failed to resolve path: " + rawPath, e);
@@ -589,6 +602,15 @@
         }
     }
 
+    private ObbInfo getObbInfo(String canonicalPath) {
+        try {
+            final ObbInfo obbInfo = ObbScanner.getObbInfo(canonicalPath);
+            return obbInfo;
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Couldn't get OBB info for " + canonicalPath, e);
+        }
+    }
+
     /**
      * Unmount an Opaque Binary Blob (OBB) file asynchronously. If the
      * <code>force</code> flag is true, it will kill any application needed to
@@ -658,6 +680,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public @NonNull List<DiskInfo> getDisks() {
         try {
             return Arrays.asList(mStorageManager.getDisks());
@@ -667,6 +690,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public @Nullable DiskInfo findDiskById(String id) {
         Preconditions.checkNotNull(id);
         // TODO; go directly to service to make this faster
@@ -679,6 +703,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public @Nullable VolumeInfo findVolumeById(String id) {
         Preconditions.checkNotNull(id);
         // TODO; go directly to service to make this faster
@@ -691,6 +716,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public @Nullable VolumeInfo findVolumeByUuid(String fsUuid) {
         Preconditions.checkNotNull(fsUuid);
         // TODO; go directly to service to make this faster
@@ -724,6 +750,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public @Nullable VolumeInfo findEmulatedForPrivate(VolumeInfo privateVol) {
         if (privateVol != null) {
             return findVolumeById(privateVol.getId().replace("private", "emulated"));
@@ -802,6 +829,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public @NonNull List<VolumeInfo> getVolumes() {
         try {
             return Arrays.asList(mStorageManager.getVolumes(0));
@@ -835,6 +863,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public @Nullable String getBestVolumeDescription(VolumeInfo vol) {
         if (vol == null) return null;
 
@@ -858,6 +887,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public @Nullable VolumeInfo getPrimaryPhysicalVolume() {
         final List<VolumeInfo> vols = getVolumes();
         for (VolumeInfo vol : vols) {
@@ -878,6 +908,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public void unmount(String volId) {
         try {
             mStorageManager.unmount(volId);
@@ -887,6 +918,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public void format(String volId) {
         try {
             mStorageManager.format(volId);
@@ -928,6 +960,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public void partitionPublic(String diskId) {
         try {
             mStorageManager.partitionPublic(diskId);
@@ -1057,6 +1090,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     private static @Nullable StorageVolume getStorageVolume(StorageVolume[] volumes, File file) {
         if (file == null) {
             return null;
@@ -1086,6 +1120,7 @@
      * @hide
      */
     @Deprecated
+    @UnsupportedAppUsage
     public @NonNull String getVolumeState(String mountPoint) {
         final StorageVolume vol = getStorageVolume(new File(mountPoint));
         if (vol != null) {
@@ -1149,6 +1184,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public static @NonNull StorageVolume[] getVolumeList(int userId, int flags) {
         final IStorageManager storageManager = IStorageManager.Stub.asInterface(
                 ServiceManager.getService("mount"));
@@ -1182,6 +1218,7 @@
      * @hide
      */
     @Deprecated
+    @UnsupportedAppUsage
     public @NonNull String[] getVolumePaths() {
         StorageVolume[] volumes = getVolumeList();
         int count = volumes.length;
@@ -1221,6 +1258,7 @@
      *
      * @hide
      */
+    @UnsupportedAppUsage
     public long getStorageBytesUntilLow(File path) {
         return path.getUsableSpace() - getStorageFullBytes(path);
     }
@@ -1231,6 +1269,7 @@
      *
      * @hide
      */
+    @UnsupportedAppUsage
     public long getStorageLowBytes(File path) {
         final long lowPercent = Settings.Global.getInt(mResolver,
                 Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE, DEFAULT_THRESHOLD_PERCENTAGE);
@@ -1274,6 +1313,7 @@
      *
      * @hide
      */
+    @UnsupportedAppUsage
     public long getStorageFullBytes(File path) {
         return Settings.Global.getLong(mResolver, Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES,
                 DEFAULT_FULL_THRESHOLD_BYTES);
@@ -1390,6 +1430,7 @@
      * @return true for file encrypted. (Implies isEncrypted() == true)
      *         false not encrypted or block encrypted
      */
+    @UnsupportedAppUsage
     public static boolean isFileEncryptedNativeOnly() {
         if (!isEncrypted()) {
             return false;
@@ -2050,8 +2091,10 @@
 
     /// Consts to match the password types in cryptfs.h
     /** @hide */
+    @UnsupportedAppUsage
     public static final int CRYPT_TYPE_PASSWORD = IVold.PASSWORD_TYPE_PASSWORD;
     /** @hide */
+    @UnsupportedAppUsage
     public static final int CRYPT_TYPE_DEFAULT = IVold.PASSWORD_TYPE_DEFAULT;
     /** @hide */
     public static final int CRYPT_TYPE_PATTERN = IVold.PASSWORD_TYPE_PATTERN;
diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java
index 9880142..deff693 100644
--- a/core/java/android/os/storage/StorageVolume.java
+++ b/core/java/android/os/storage/StorageVolume.java
@@ -18,6 +18,7 @@
 
 import android.annotation.Nullable;
 import android.annotation.TestApi;
+import android.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -77,11 +78,16 @@
 // user, but is now part of the public API.
 public final class StorageVolume implements Parcelable {
 
+    @UnsupportedAppUsage
     private final String mId;
+    @UnsupportedAppUsage
     private final File mPath;
     private final File mInternalPath;
+    @UnsupportedAppUsage
     private final String mDescription;
+    @UnsupportedAppUsage
     private final boolean mPrimary;
+    @UnsupportedAppUsage
     private final boolean mRemovable;
     private final boolean mEmulated;
     private final boolean mAllowMassStorage;
@@ -153,6 +159,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public String getId() {
         return mId;
     }
@@ -179,6 +186,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public File getPathFile() {
         return mPath;
     }
@@ -224,6 +232,7 @@
      * @return whether mass storage is allowed
      * @hide
      */
+    @UnsupportedAppUsage
     public boolean allowMassStorage() {
         return mAllowMassStorage;
     }
@@ -234,11 +243,13 @@
      * @return maximum file size
      * @hide
      */
+    @UnsupportedAppUsage
     public long getMaxFileSize() {
         return mMaxFileSize;
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public UserHandle getOwner() {
         return mOwner;
     }
@@ -255,6 +266,7 @@
      * parse or UUID is unknown.
      * @hide
      */
+    @UnsupportedAppUsage
     public int getFatVolumeId() {
         if (mFsUuid == null || mFsUuid.length() != 9) {
             return -1;
@@ -267,6 +279,7 @@
     }
 
     /** {@hide} */
+    @UnsupportedAppUsage
     public String getUserLabel() {
         return mDescription;
     }
diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java
index 8c77502..afd38369 100644
--- a/core/java/android/os/storage/VolumeInfo.java
+++ b/core/java/android/os/storage/VolumeInfo.java
@@ -18,6 +18,7 @@
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -76,8 +77,10 @@
     /** Real volume representing internal emulated storage */
     public static final String ID_EMULATED_INTERNAL = "emulated";
 
+    @UnsupportedAppUsage
     public static final int TYPE_PUBLIC = IVold.VOLUME_TYPE_PUBLIC;
     public static final int TYPE_PRIVATE = IVold.VOLUME_TYPE_PRIVATE;
+    @UnsupportedAppUsage
     public static final int TYPE_EMULATED = IVold.VOLUME_TYPE_EMULATED;
     public static final int TYPE_ASEC = IVold.VOLUME_TYPE_ASEC;
     public static final int TYPE_OBB = IVold.VOLUME_TYPE_OBB;
@@ -148,16 +151,23 @@
 
     /** vold state */
     public final String id;
+    @UnsupportedAppUsage
     public final int type;
+    @UnsupportedAppUsage
     public final DiskInfo disk;
     public final String partGuid;
     public int mountFlags = 0;
     public int mountUserId = -1;
+    @UnsupportedAppUsage
     public int state = STATE_UNMOUNTED;
     public String fsType;
+    @UnsupportedAppUsage
     public String fsUuid;
+    @UnsupportedAppUsage
     public String fsLabel;
+    @UnsupportedAppUsage
     public String path;
+    @UnsupportedAppUsage
     public String internalPath;
 
     public VolumeInfo(String id, int type, DiskInfo disk, String partGuid) {
@@ -167,6 +177,7 @@
         this.partGuid = partGuid;
     }
 
+    @UnsupportedAppUsage
     public VolumeInfo(Parcel parcel) {
         id = parcel.readString();
         type = parcel.readInt();
@@ -186,6 +197,7 @@
         internalPath = parcel.readString();
     }
 
+    @UnsupportedAppUsage
     public static @NonNull String getEnvironmentForState(int state) {
         final String envState = sStateToEnvironment.get(state);
         if (envState != null) {
@@ -207,22 +219,27 @@
         return sDescriptionComparator;
     }
 
+    @UnsupportedAppUsage
     public @NonNull String getId() {
         return id;
     }
 
+    @UnsupportedAppUsage
     public @Nullable DiskInfo getDisk() {
         return disk;
     }
 
+    @UnsupportedAppUsage
     public @Nullable String getDiskId() {
         return (disk != null) ? disk.id : null;
     }
 
+    @UnsupportedAppUsage
     public int getType() {
         return type;
     }
 
+    @UnsupportedAppUsage
     public int getState() {
         return state;
     }
@@ -231,14 +248,17 @@
         return sStateToDescrip.get(state, 0);
     }
 
+    @UnsupportedAppUsage
     public @Nullable String getFsUuid() {
         return fsUuid;
     }
 
+    @UnsupportedAppUsage
     public int getMountUserId() {
         return mountUserId;
     }
 
+    @UnsupportedAppUsage
     public @Nullable String getDescription() {
         if (ID_PRIVATE_INTERNAL.equals(id) || ID_EMULATED_INTERNAL.equals(id)) {
             return Resources.getSystem().getString(com.android.internal.R.string.storage_internal);
@@ -249,22 +269,27 @@
         }
     }
 
+    @UnsupportedAppUsage
     public boolean isMountedReadable() {
         return state == STATE_MOUNTED || state == STATE_MOUNTED_READ_ONLY;
     }
 
+    @UnsupportedAppUsage
     public boolean isMountedWritable() {
         return state == STATE_MOUNTED;
     }
 
+    @UnsupportedAppUsage
     public boolean isPrimary() {
         return (mountFlags & MOUNT_FLAG_PRIMARY) != 0;
     }
 
+    @UnsupportedAppUsage
     public boolean isPrimaryPhysical() {
         return isPrimary() && (getType() == TYPE_PUBLIC);
     }
 
+    @UnsupportedAppUsage
     public boolean isVisible() {
         return (mountFlags & MOUNT_FLAG_VISIBLE) != 0;
     }
@@ -283,18 +308,22 @@
         return isVisibleForUser(userId);
     }
 
+    @UnsupportedAppUsage
     public boolean isVisibleForWrite(int userId) {
         return isVisibleForUser(userId);
     }
 
+    @UnsupportedAppUsage
     public File getPath() {
         return (path != null) ? new File(path) : null;
     }
 
+    @UnsupportedAppUsage
     public File getInternalPath() {
         return (internalPath != null) ? new File(internalPath) : null;
     }
 
+    @UnsupportedAppUsage
     public File getPathForUser(int userId) {
         if (path == null) {
             return null;
@@ -311,6 +340,7 @@
      * Path which is accessible to apps holding
      * {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}.
      */
+    @UnsupportedAppUsage
     public File getInternalPathForUser(int userId) {
         if (path == null) {
             return null;
@@ -322,6 +352,7 @@
         }
     }
 
+    @UnsupportedAppUsage
     public StorageVolume buildStorageVolume(Context context, int userId, boolean reportUnmounted) {
         final StorageManager storage = context.getSystemService(StorageManager.class);
 
@@ -382,6 +413,7 @@
                 derivedFsUuid, envState);
     }
 
+    @UnsupportedAppUsage
     public static int buildStableMtpStorageId(String fsUuid) {
         if (TextUtils.isEmpty(fsUuid)) {
             return StorageVolume.STORAGE_ID_INVALID;
@@ -408,6 +440,7 @@
      * Build an intent to browse the contents of this volume. Only valid for
      * {@link #TYPE_EMULATED} or {@link #TYPE_PUBLIC}.
      */
+    @UnsupportedAppUsage
     public @Nullable Intent buildBrowseIntent() {
         return buildBrowseIntentForUser(UserHandle.myUserId());
     }
@@ -486,6 +519,7 @@
         return id.hashCode();
     }
 
+    @UnsupportedAppUsage
     public static final Creator<VolumeInfo> CREATOR = new Creator<VolumeInfo>() {
         @Override
         public VolumeInfo createFromParcel(Parcel in) {
diff --git a/core/java/android/os/storage/VolumeRecord.java b/core/java/android/os/storage/VolumeRecord.java
index 7b20223..bc2d55a 100644
--- a/core/java/android/os/storage/VolumeRecord.java
+++ b/core/java/android/os/storage/VolumeRecord.java
@@ -16,6 +16,7 @@
 
 package android.os.storage;
 
+import android.annotation.UnsupportedAppUsage;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.DebugUtils;
@@ -52,6 +53,7 @@
         this.fsUuid = Preconditions.checkNotNull(fsUuid);
     }
 
+    @UnsupportedAppUsage
     public VolumeRecord(Parcel parcel) {
         type = parcel.readInt();
         fsUuid = parcel.readString();
@@ -127,6 +129,7 @@
         return fsUuid.hashCode();
     }
 
+    @UnsupportedAppUsage
     public static final Creator<VolumeRecord> CREATOR = new Creator<VolumeRecord>() {
         @Override
         public VolumeRecord createFromParcel(Parcel in) {
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index bffed8d..a1cc67d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1469,6 +1469,7 @@
      *
      * @hide
      */
+    @SystemApi
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
     public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS
             = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";
@@ -9556,6 +9557,17 @@
         public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled";
 
         /**
+         * Use the old dnsmasq DHCP server for tethering instead of the framework implementation.
+         *
+         * Integer values are interpreted as boolean, and the absence of an explicit setting
+         * is interpreted as |true|.
+         * TODO: make the default |false|
+         * @hide
+         */
+        public static final String TETHER_ENABLE_LEGACY_DHCP_SERVER =
+                "tether_enable_legacy_dhcp_server";
+
+        /**
          * List of certificate (hex string representation of the application's certificate - SHA-1
          * or SHA-256) and carrier app package pairs which are whitelisted to prompt the user for
          * install when a sim card with matching UICC carrier privilege rules is inserted.  The
diff --git a/core/java/android/service/autofill/AutofillFieldClassificationService.java b/core/java/android/service/autofill/AutofillFieldClassificationService.java
index e5e1c92..1cd76d2 100644
--- a/core/java/android/service/autofill/AutofillFieldClassificationService.java
+++ b/core/java/android/service/autofill/AutofillFieldClassificationService.java
@@ -65,36 +65,16 @@
     /**
      * Manifest metadata key for the resource string containing the name of the default field
      * classification algorithm.
-     *
-     * @deprecated Use {@link #RESOURCE_DEFAULT_ALGORITHM} instead.
      */
-    @Deprecated
     public static final String SERVICE_META_DATA_KEY_DEFAULT_ALGORITHM =
             "android.autofill.field_classification.default_algorithm";
-
     /**
      * Manifest metadata key for the resource string array containing the names of all field
      * classification algorithms provided by the service.
-     *
-     * @deprecated Use {@link #RESOURCE_AVAILABLE_ALGORITHMS} instead.
      */
-    @Deprecated
     public static final String SERVICE_META_DATA_KEY_AVAILABLE_ALGORITHMS =
             "android.autofill.field_classification.available_algorithms";
 
-    /**
-     * Name of the resource string containing the name of the default field
-     * classification algorithm.
-     */
-    public static final String RESOURCE_DEFAULT_ALGORITHM =
-            "autofill_field_classification_default_algorithm";
-
-   /**
-    * Name of the resource string array containing the names of all field
-    * classification algorithms provided by the service.
-    */
-    public static final String RESOURCE_AVAILABLE_ALGORITHMS =
-            "autofill_field_classification_available_algorithms";
 
     /** {@hide} **/
     public static final String EXTRA_SCORES = "scores";
diff --git a/core/java/android/service/autofill/FillRequest.java b/core/java/android/service/autofill/FillRequest.java
index 4bd6e5c..1d0c987 100644
--- a/core/java/android/service/autofill/FillRequest.java
+++ b/core/java/android/service/autofill/FillRequest.java
@@ -123,6 +123,10 @@
 
     /**
      * Gets the contexts associated with each previous fill request.
+     *
+     * <p><b>Note:</b> Starting on Android {@link android.os.Build.VERSION_CODES#Q}, it could also
+     * include contexts from requests whose {@link SaveInfo} had the
+     * {@link SaveInfo#FLAG_DELAY_SAVE} flag.
      */
     public @NonNull List<FillContext> getFillContexts() {
         return mContexts;
diff --git a/core/java/android/service/autofill/SaveInfo.java b/core/java/android/service/autofill/SaveInfo.java
index b845250..f571956 100644
--- a/core/java/android/service/autofill/SaveInfo.java
+++ b/core/java/android/service/autofill/SaveInfo.java
@@ -246,7 +246,7 @@
      * multiple screens to implement an autofillable workflow (for example, one screen for the
      * username field, another for password).
      */
-    // TODO(b/112051762): improve documentation: add example, document relationship with other
+    // TODO(b/113281366): improve documentation: add example, document relationship with other
     // flagss, etc...
     public static final int FLAG_DELAY_SAVE = 0x4;
 
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 2846730..febdb83 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -45,6 +45,7 @@
 import android.util.MergedConfiguration;
 import android.view.Display;
 import android.view.DisplayCutout;
+import android.view.DisplayInfo;
 import android.view.Gravity;
 import android.view.IWindowSession;
 import android.view.InputChannel;
@@ -163,7 +164,8 @@
         int mType;
         int mCurWidth;
         int mCurHeight;
-        int mWindowFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
+        int mWindowFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+                         | WindowManager.LayoutParams.FLAG_SCALED;
         int mWindowPrivateFlags =
                 WindowManager.LayoutParams.PRIVATE_FLAG_WANTS_OFFSET_NOTIFICATIONS;
         int mCurWindowFlags = mWindowFlags;
@@ -763,9 +765,19 @@
 
                     mLayout.x = 0;
                     mLayout.y = 0;
-                    mLayout.width = myWidth;
-                    mLayout.height = myHeight;
-                    
+
+                    if (!fixedSize) {
+                        mLayout.width = myWidth;
+                        mLayout.height = myHeight;
+                    } else {
+                        // Force the wallpaper to cover the screen in both dimensions
+                        // only internal implementations like ImageWallpaper
+                        DisplayInfo displayInfo = new DisplayInfo();
+                        mDisplay.getDisplayInfo(displayInfo);
+                        mLayout.width = Math.max(displayInfo.logicalWidth, myWidth);
+                        mLayout.height = Math.max(displayInfo.logicalHeight, myHeight);
+                    }
+
                     mLayout.format = mFormat;
                     
                     mCurWindowFlags = mWindowFlags;
@@ -773,7 +785,8 @@
                             | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
                             | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR
                             | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
-                            | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+                            | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                            | WindowManager.LayoutParams.FLAG_SCALED;
                     mCurWindowPrivateFlags = mWindowPrivateFlags;
                     mLayout.privateFlags = mWindowPrivateFlags;
 
@@ -847,6 +860,9 @@
                         mStableInsets.bottom += padding.bottom;
                         mDisplayCutout.set(mDisplayCutout.get().inset(-padding.left, -padding.top,
                                 -padding.right, -padding.bottom));
+                    } else {
+                        w = myWidth;
+                        h = myHeight;
                     }
 
                     if (mCurWidth != w) {
diff --git a/core/java/android/transition/ChangeBounds.java b/core/java/android/transition/ChangeBounds.java
index 56af3ac..c822832 100644
--- a/core/java/android/transition/ChangeBounds.java
+++ b/core/java/android/transition/ChangeBounds.java
@@ -22,6 +22,7 @@
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.animation.RectEvaluator;
+import android.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
@@ -108,6 +109,7 @@
                 }
             };
 
+    @UnsupportedAppUsage
     private static final Property<View, PointF> BOTTOM_RIGHT_ONLY_PROPERTY =
             new Property<View, PointF>(PointF.class, "bottomRight") {
                 @Override
@@ -142,6 +144,7 @@
                 }
             };
 
+    @UnsupportedAppUsage
     private static final Property<View, PointF> POSITION_PROPERTY =
             new Property<View, PointF>(PointF.class, "position") {
                 @Override
diff --git a/core/java/android/transition/Scene.java b/core/java/android/transition/Scene.java
index 2c858cd..1bdcff9 100644
--- a/core/java/android/transition/Scene.java
+++ b/core/java/android/transition/Scene.java
@@ -16,6 +16,7 @@
 
 package android.transition;
 
+import android.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -35,7 +36,9 @@
     private int mLayoutId = -1;
     private ViewGroup mSceneRoot;
     private View mLayout; // alternative to layoutId
+    @UnsupportedAppUsage
     Runnable mEnterAction;
+    @UnsupportedAppUsage
     Runnable mExitAction;
 
     /**
@@ -195,6 +198,7 @@
      *
      * @param view The view on which the current scene is being set
      */
+    @UnsupportedAppUsage
     static void setCurrentScene(View view, Scene scene) {
         view.setTagInternal(com.android.internal.R.id.current_scene, scene);
     }
diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java
index 255a029..b79228d 100644
--- a/core/java/android/transition/Transition.java
+++ b/core/java/android/transition/Transition.java
@@ -20,6 +20,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.TimeInterpolator;
 import android.annotation.Nullable;
+import android.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Path;
@@ -848,6 +849,7 @@
         return false;
     }
 
+    @UnsupportedAppUsage
     private static ArrayMap<Animator, AnimationInfo> getRunningAnimators() {
         ArrayMap<Animator, AnimationInfo> runningAnimators = sRunningAnimators.get();
         if (runningAnimators == null) {
@@ -1915,6 +1917,7 @@
      *
      * @hide
      */
+    @UnsupportedAppUsage
     protected void end() {
         --mNumInstances;
         if (mNumInstances == 0) {
@@ -1967,6 +1970,7 @@
      *
      * @hide
      */
+    @UnsupportedAppUsage
     protected void cancel() {
         int numAnimators = mCurrentAnimators.size();
         for (int i = numAnimators - 1; i >= 0; i--) {
diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java
index 45134c0..f8e8762 100644
--- a/core/java/android/transition/TransitionManager.java
+++ b/core/java/android/transition/TransitionManager.java
@@ -17,6 +17,7 @@
 package android.transition;
 
 import android.annotation.TestApi;
+import android.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.util.ArrayMap;
 import android.util.Log;
@@ -73,9 +74,11 @@
     ArrayMap<Scene, Transition> mSceneTransitions = new ArrayMap<Scene, Transition>();
     ArrayMap<Scene, ArrayMap<Scene, Transition>> mScenePairTransitions =
             new ArrayMap<Scene, ArrayMap<Scene, Transition>>();
+    @UnsupportedAppUsage
     private static ThreadLocal<WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>>>
             sRunningTransitions =
             new ThreadLocal<WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>>>();
+    @UnsupportedAppUsage
     private static ArrayList<ViewGroup> sPendingTransitions = new ArrayList<ViewGroup>();
 
 
@@ -207,6 +210,7 @@
         }
     }
 
+    @UnsupportedAppUsage
     private static ArrayMap<ViewGroup, ArrayList<Transition>> getRunningTransitions() {
         WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>> runningTransitions =
                 sRunningTransitions.get();
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
old mode 100644
new mode 100755
index b092fcf..f2747cf
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -142,6 +142,14 @@
     public static final int DENSITY_560 = 560;
 
     /**
+     * Intermediate density for screens that sit somewhere between
+     * {@link #DENSITY_XXHIGH} (480 dpi) and {@link #DENSITY_XXXHIGH} (640 dpi).
+     * This is not a density that applications should target, instead relying
+     * on the system to scale their {@link #DENSITY_XXXHIGH} assets for them.
+     */
+    public static final int DENSITY_600 = 600;
+
+    /**
      * Standard quantized DPI for extra-extra-extra-high-density screens.  Applications
      * should not generally worry about this density; relying on XHIGH graphics
      * being scaled up to it should be sufficient for almost all cases.  A typical
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 0398b8f..c205af0 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -73,7 +73,6 @@
 
     IWindowSession openSession(in IWindowSessionCallback callback, in IInputMethodClient client,
             in IInputContext inputContext);
-    boolean inputMethodClientHasFocus(IInputMethodClient client);
 
     void getInitialDisplaySize(int displayId, out Point size);
     void getBaseDisplaySize(int displayId, out Point size);
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index d9c8f30..79eafa8 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -109,8 +109,6 @@
             int flags, int mask);
     private static native void nativeSetWindowCrop(long transactionObj, long nativeObject,
             int l, int t, int r, int b);
-    private static native void nativeSetFinalCrop(long transactionObj, long nativeObject,
-            int l, int t, int r, int b);
     private static native void nativeSetLayerStack(long transactionObj, long nativeObject,
             int layerStack);
 
@@ -268,6 +266,13 @@
     public static final int FX_SURFACE_DIM = 0x00020000;
 
     /**
+     * Surface creation flag: Creates a container surface.
+     * This surface will have no buffers and will only be used
+     * as a container for other surfaces, or for its InputInfo.
+     */
+    public static final int FX_SURFACE_CONTAINER = 0x00080000;
+
+    /**
      * Mask used for FX values above.
      *
      */
@@ -531,6 +536,23 @@
         }
 
         /**
+         * Indicates whether a 'ContainerLayer' is to be constructed.
+         *
+         * Container layers will not be rendered in any fashion and instead are used
+         * as a parent of renderable layers.
+         *
+         * @param isContainerLayer Whether to create a container layer.
+         */
+        public Builder setContainerLayer(boolean isContainerLayer) {
+            if (isContainerLayer) {
+                mFlags |= FX_SURFACE_CONTAINER;
+            } else {
+                mFlags &= ~FX_SURFACE_CONTAINER;
+            }
+            return this;
+        }
+
+        /**
          * Set 'Surface creation flags' such as {@link HIDDEN}, {@link SECURE}.
          *
          * TODO: Finish conversion to individual builder methods?
@@ -937,13 +959,6 @@
         }
     }
 
-    public void setFinalCrop(Rect crop) {
-        checkNotReleased();
-        synchronized (SurfaceControl.class) {
-            sGlobalTransaction.setFinalCrop(this, crop);
-        }
-    }
-
     public void setLayerStack(int layerStack) {
         checkNotReleased();
         synchronized(SurfaceControl.class) {
@@ -1497,18 +1512,6 @@
         }
 
         @UnsupportedAppUsage
-        public Transaction setFinalCrop(SurfaceControl sc, Rect crop) {
-            sc.checkNotReleased();
-            if (crop != null) {
-                nativeSetFinalCrop(mNativeObject, sc.mNativeObject,
-                        crop.left, crop.top, crop.right, crop.bottom);
-            } else {
-                nativeSetFinalCrop(mNativeObject, sc.mNativeObject, 0, 0, 0, 0);
-            }
-
-            return this;
-        }
-
         public Transaction setLayerStack(SurfaceControl sc, int layerStack) {
             sc.checkNotReleased();
             nativeSetLayerStack(mNativeObject, sc.mNativeObject, layerStack);
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 6319a8f..274dd2f 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -1168,12 +1168,6 @@
         }
 
         @Override
-        public void setFinalCrop(Rect crop) {
-            super.setFinalCrop(crop);
-            mBackgroundControl.setFinalCrop(crop);
-        }
-
-        @Override
         public void setLayerStack(int layerStack) {
             super.setLayerStack(layerStack);
             mBackgroundControl.setLayerStack(layerStack);
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 7762ecf..d3fd0cf 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -637,10 +637,6 @@
         }
 
         @Override
-        public void setUsingInputMethod(boolean state) {
-        }
-
-        @Override
         public void onBindMethod(InputBindResult res) {
             mH.obtainMessage(MSG_BIND, res).sendToTarget();
         }
diff --git a/core/java/android/view/inputmethod/InputMethodManagerInternal.java b/core/java/android/view/inputmethod/InputMethodManagerInternal.java
deleted file mode 100644
index 276fab9..0000000
--- a/core/java/android/view/inputmethod/InputMethodManagerInternal.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.view.inputmethod;
-
-import android.content.ComponentName;
-
-/**
- * Input method manager local system service interface.
- *
- * @hide Only for use within the system server.
- */
-public interface InputMethodManagerInternal {
-    /**
-     * Called by the power manager to tell the input method manager whether it
-     * should start watching for wake events.
-     */
-    void setInteractive(boolean interactive);
-
-    /**
-     * Hides the current input method, if visible.
-     */
-    void hideCurrentInputMethod();
-
-    /**
-     * Switches to VR InputMethod defined in the packageName of {@param componentName}.
-     */
-    void startVrInputMethodNoCheck(ComponentName componentName);
-}
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 47ce90b..4428598 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -4898,23 +4898,23 @@
                     : controller.mEndHandle;
         }
 
-        private final Magnifier.Callback mHandlesVisibilityCallback = new Magnifier.Callback() {
-            @Override
-            public void onOperationComplete() {
-                final Point magnifierTopLeft = mMagnifierAnimator.mMagnifier.getWindowCoords();
-                if (magnifierTopLeft == null) {
-                    return;
-                }
-                final Rect magnifierRect = new Rect(magnifierTopLeft.x, magnifierTopLeft.y,
-                        magnifierTopLeft.x + mMagnifierAnimator.mMagnifier.getWidth(),
-                        magnifierTopLeft.y + mMagnifierAnimator.mMagnifier.getHeight());
-                setVisible(!handleOverlapsMagnifier(HandleView.this, magnifierRect));
-                final HandleView otherHandle = getOtherSelectionHandle();
-                if (otherHandle != null) {
-                    otherHandle.setVisible(!handleOverlapsMagnifier(otherHandle, magnifierRect));
-                }
+        private void updateHandlesVisibility() {
+            final Point magnifierTopLeft = mMagnifierAnimator.mMagnifier.getPosition();
+            if (magnifierTopLeft == null) {
+                return;
             }
-        };
+            final Rect surfaceInsets =
+                    mTextView.getViewRootImpl().mWindowAttributes.surfaceInsets;
+            magnifierTopLeft.offset(-surfaceInsets.left, -surfaceInsets.top);
+            final Rect magnifierRect = new Rect(magnifierTopLeft.x, magnifierTopLeft.y,
+                    magnifierTopLeft.x + mMagnifierAnimator.mMagnifier.getWidth(),
+                    magnifierTopLeft.y + mMagnifierAnimator.mMagnifier.getHeight());
+            setVisible(!handleOverlapsMagnifier(HandleView.this, magnifierRect));
+            final HandleView otherHandle = getOtherSelectionHandle();
+            if (otherHandle != null) {
+                otherHandle.setVisible(!handleOverlapsMagnifier(otherHandle, magnifierRect));
+            }
+        }
 
         protected final void updateMagnifier(@NonNull final MotionEvent event) {
             if (mMagnifierAnimator == null) {
@@ -4929,10 +4929,9 @@
                 mRenderCursorRegardlessTiming = true;
                 mTextView.invalidateCursorPath();
                 suspendBlink();
-                mMagnifierAnimator.mMagnifier
-                        .setOnOperationCompleteCallback(mHandlesVisibilityCallback);
 
                 mMagnifierAnimator.show(showPosInView.x, showPosInView.y);
+                updateHandlesVisibility();
             } else {
                 dismissMagnifier();
             }
@@ -4940,7 +4939,6 @@
 
         protected final void dismissMagnifier() {
             if (mMagnifierAnimator != null) {
-                mMagnifierAnimator.mMagnifier.setOnOperationCompleteCallback(null);
                 mMagnifierAnimator.dismiss();
                 mRenderCursorRegardlessTiming = false;
                 resumeBlink();
diff --git a/core/java/android/widget/Magnifier.java b/core/java/android/widget/Magnifier.java
index 5734171..8e2786d 100644
--- a/core/java/android/widget/Magnifier.java
+++ b/core/java/android/widget/Magnifier.java
@@ -17,8 +17,10 @@
 package android.widget;
 
 import android.annotation.FloatRange;
+import android.annotation.IntRange;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.Px;
 import android.annotation.TestApi;
 import android.annotation.UiThread;
 import android.content.Context;
@@ -74,16 +76,22 @@
     private final int mWindowWidth;
     // The height of the window containing the magnifier.
     private final int mWindowHeight;
-    // The zoom applied to the view region copied to the magnifier window.
-    private final float mZoom;
+    // The zoom applied to the view region copied to the magnifier view.
+    private float mZoom;
     // The width of the content that will be copied to the magnifier.
-    private final int mSourceWidth;
+    private int mSourceWidth;
     // The height of the content that will be copied to the magnifier.
-    private final int mSourceHeight;
+    private int mSourceHeight;
+    // Whether the zoom of the magnifier has changed since last content copy.
+    private boolean mDirtyZoom;
     // The elevation of the window containing the magnifier.
     private final float mWindowElevation;
     // The corner radius of the window containing the magnifier.
     private final float mWindowCornerRadius;
+    // The horizontal offset between the source and window coords when #show(float, float) is used.
+    private final int mDefaultHorizontalSourceToMagnifierOffset;
+    // The vertical offset between the source and window coords when #show(float, float) is used.
+    private final int mDefaultVerticalSourceToMagnifierOffset;
     // The parent surface for the magnifier surface.
     private SurfaceInfo mParentSurface;
     // The surface where the content will be copied from.
@@ -110,17 +118,27 @@
      * Initializes a magnifier.
      *
      * @param view the view for which this magnifier is attached
+     *
+     * @see Builder
      */
     public Magnifier(@NonNull View view) {
-        mView = Preconditions.checkNotNull(view);
-        final Context context = mView.getContext();
-        mWindowWidth = context.getResources().getDimensionPixelSize(R.dimen.magnifier_width);
-        mWindowHeight = context.getResources().getDimensionPixelSize(R.dimen.magnifier_height);
-        mWindowElevation = context.getResources().getDimension(R.dimen.magnifier_elevation);
-        mWindowCornerRadius = getDeviceDefaultDialogCornerRadius();
-        mZoom = context.getResources().getFloat(R.dimen.magnifier_zoom_scale);
+        this(new Builder(view));
+    }
+
+    private Magnifier(@NonNull Builder params) {
+        // Copy params from builder.
+        mView = params.mView;
+        mWindowWidth = params.mWidth;
+        mWindowHeight = params.mHeight;
+        mZoom = params.mZoom;
         mSourceWidth = Math.round(mWindowWidth / mZoom);
         mSourceHeight = Math.round(mWindowHeight / mZoom);
+        mWindowElevation = params.mElevation;
+        mWindowCornerRadius = params.mCornerRadius;
+        mDefaultHorizontalSourceToMagnifierOffset =
+                params.mHorizontalDefaultSourceToMagnifierOffset;
+        mDefaultVerticalSourceToMagnifierOffset =
+                params.mVerticalDefaultSourceToMagnifierOffset;
         // The view's surface coordinates will not be updated until the magnifier is first shown.
         mViewCoordinatesInSurface = new int[2];
     }
@@ -130,53 +148,43 @@
     }
 
     /**
-     * Returns the device default theme dialog corner radius attribute.
-     * We retrieve this from the device default theme to avoid
-     * using the values set in the custom application themes.
-     */
-    private float getDeviceDefaultDialogCornerRadius() {
-        final Context deviceDefaultContext =
-                new ContextThemeWrapper(mView.getContext(), R.style.Theme_DeviceDefault);
-        final TypedArray ta = deviceDefaultContext.obtainStyledAttributes(
-                new int[]{android.R.attr.dialogCornerRadius});
-        final float dialogCornerRadius = ta.getDimension(0, 0);
-        ta.recycle();
-        return dialogCornerRadius;
-    }
-
-    /**
-     * Shows the magnifier on the screen.
+     * Shows the magnifier on the screen. The method takes the coordinates of the center
+     * of the content source going to be magnified and copied to the magnifier. The coordinates
+     * are relative to the top left corner of the magnified view. The magnifier will be
+     * positioned such that its center will be at the default offset from the center of the source.
+     * The default offset can be specified using the method
+     * {@link Builder#setDefaultSourceToMagnifierOffset(int, int)}. If the offset should
+     * be different across calls to this method, you should consider to use method
+     * {@link #show(float, float, float, float)} instead.
      *
-     * @param sourceCenterX horizontal coordinate of the center point of the source rectangle that
-     *        will be magnified and copied to the magnifier, relative to the view.
-     *        The parameter is clamped such that the copy rectangle fits inside [0, view width].
-     * @param sourceCenterY vertical coordinate of the center point of the source rectangle that
-     *        will be magnified and copied to the magnifier, relative to the view.
-     *        The parameter is clamped such that the copy rectangle fits inside [0, view height].
+     * @param sourceCenterX horizontal coordinate of the source center, relative to the view
+     * @param sourceCenterY vertical coordinate of the source center, relative to the view
+     *
+     * @see Builder#setDefaultSourceToMagnifierOffset(int, int)
+     * @see Builder#getDefaultHorizontalSourceToMagnifierOffset()
+     * @see Builder#getDefaultVerticalSourceToMagnifierOffset()
+     * @see #show(float, float, float, float)
      */
     public void show(@FloatRange(from = 0) float sourceCenterX,
             @FloatRange(from = 0) float sourceCenterY) {
-        final int verticalOffset = mView.getContext().getResources()
-                .getDimensionPixelSize(R.dimen.magnifier_offset);
-        show(sourceCenterX, sourceCenterY, sourceCenterX, sourceCenterY - verticalOffset);
+        show(sourceCenterX, sourceCenterY,
+                sourceCenterX + mDefaultHorizontalSourceToMagnifierOffset,
+                sourceCenterY + mDefaultVerticalSourceToMagnifierOffset);
     }
 
     /**
-     * Shows the magnifier on the screen at a position
-     * that is independent from its content position.
+     * Shows the magnifier on the screen at a position that is independent from its content
+     * position. The first two arguments represent the coordinates of the center of the
+     * content source going to be magnified and copied to the magnifier. The last two arguments
+     * represent the coordinates of the center of the magnifier itself. All four coordinates
+     * are relative to the top left corner of the magnified view. If you consider using this
+     * method such that the offset between the source center and the magnifier center coordinates
+     * remains constant, you should consider using method {@link #show(float, float)} instead.
      *
-     * @param sourceCenterX horizontal coordinate of the center point of the source rectangle that
-     *        will be magnified and copied to the magnifier, relative to the view.
-     *        The parameter is clamped such that the copy rectangle fits inside [0, view width].
-     * @param sourceCenterY vertical coordinate of the center point of the source rectangle that
-     *        will be magnified and copied to the magnifier, relative to the view.
-     *        The parameter is clamped such that the copy rectangle fits inside [0, view height].
-     * @param magnifierCenterX horizontal coordinate of the center point of the magnifier window
-     *        relative to the view. As the magnifier can be arbitrarily positioned, this can be
-     *        negative or larger than the view width.
-     * @param magnifierCenterY vertical coordinate of the center point of the magnifier window
-     *        relative to the view. As the magnifier can be arbitrarily positioned, this can be
-     *        negative or larger than the view height.
+     * @param sourceCenterX horizontal coordinate of the source center relative to the view
+     * @param sourceCenterY vertical coordinate of the source center, relative to the view
+     * @param magnifierCenterX horizontal coordinate of the magnifier center, relative to the view
+     * @param magnifierCenterY vertical coordinate of the magnifier center, relative to the view
      */
     public void show(@FloatRange(from = 0) float sourceCenterX,
             @FloatRange(from = 0) float sourceCenterY,
@@ -190,7 +198,8 @@
 
         final int startX = mClampedCenterZoomCoords.x - mSourceWidth / 2;
         final int startY = mClampedCenterZoomCoords.y - mSourceHeight / 2;
-        if (sourceCenterX != mPrevShowSourceCoords.x || sourceCenterY != mPrevShowSourceCoords.y) {
+        if (sourceCenterX != mPrevShowSourceCoords.x || sourceCenterY != mPrevShowSourceCoords.y
+                || mDirtyZoom) {
             if (mWindow == null) {
                 synchronized (mLock) {
                     mWindow = new InternalPopupWindow(mView.getContext(), mView.getDisplay(),
@@ -206,11 +215,11 @@
             final Point windowCoords = getCurrentClampedWindowCoordinates();
             final InternalPopupWindow currentWindowInstance = mWindow;
             sPixelCopyHandlerThread.getThreadHandler().post(() -> {
-                if (mWindow != currentWindowInstance) {
-                    // The magnifier was dismissed (and maybe shown again) in the meantime.
-                    return;
-                }
                 synchronized (mLock) {
+                    if (mWindow != currentWindowInstance) {
+                        // The magnifier was dismissed (and maybe shown again) in the meantime.
+                        return;
+                    }
                     mWindow.setContentPositionForNextDraw(windowCoords.x, windowCoords.y);
                 }
             });
@@ -240,54 +249,171 @@
     }
 
     /**
-     * Forces the magnifier to update its content. It uses the previous coordinates passed to
-     * {@link #show(float, float)}. This only happens if the magnifier is currently showing.
+     * Asks the magnifier to update its content. It uses the previous coordinates passed to
+     * {@link #show(float, float)} or {@link #show(float, float, float, float)}. The
+     * method only has effect if the magnifier is currently showing.
      */
     public void update() {
         if (mWindow != null) {
             obtainSurfaces();
-            // Update the content shown in the magnifier.
-            performPixelCopy(mPrevStartCoordsInSurface.x, mPrevStartCoordsInSurface.y,
-                    false /* update window position */);
+            if (!mDirtyZoom) {
+                // Update the content shown in the magnifier.
+                performPixelCopy(mPrevStartCoordsInSurface.x, mPrevStartCoordsInSurface.y,
+                        false /* update window position */);
+            } else {
+                // If the zoom has changed, we cannot use the same top left coordinates
+                // as before, so just #show again to have them recomputed.
+                show(mPrevShowSourceCoords.x, mPrevShowSourceCoords.y,
+                        mPrevShowWindowCoords.x, mPrevShowWindowCoords.y);
+            }
         }
     }
 
     /**
-     * @return The width of the magnifier window, in pixels.
+     * @return the width of the magnifier window, in pixels
+     * @see Magnifier.Builder#setSize(int, int)
      */
+    @Px
     public int getWidth() {
         return mWindowWidth;
     }
 
     /**
-     * @return The height of the magnifier window, in pixels.
+     * @return the height of the magnifier window, in pixels
+     * @see Magnifier.Builder#setSize(int, int)
      */
+    @Px
     public int getHeight() {
         return mWindowHeight;
     }
 
     /**
-     * @return The zoom applied to the magnified view region copied to the magnifier window.
+     * @return the initial width of the content magnified and copied to the magnifier, in pixels
+     * @see Magnifier.Builder#setSize(int, int)
+     * @see Magnifier.Builder#setZoom(float)
+     */
+    @Px
+    public int getSourceWidth() {
+        return mSourceWidth;
+    }
+
+    /**
+     * @return the initial height of the content magnified and copied to the magnifier, in pixels
+     * @see Magnifier.Builder#setSize(int, int)
+     * @see Magnifier.Builder#setZoom(float)
+     */
+    @Px
+    public int getSourceHeight() {
+        return mSourceHeight;
+    }
+
+    /**
+     * Sets the zoom to be applied to the chosen content before being copied to the magnifier popup.
+     * @param zoom the zoom to be set
+     */
+    public void setZoom(@FloatRange(from = 0f) float zoom) {
+        Preconditions.checkArgumentPositive(zoom, "Zoom should be positive");
+        mZoom = zoom;
+        mSourceWidth = Math.round(mWindowWidth / mZoom);
+        mSourceHeight = Math.round(mWindowHeight / mZoom);
+        mDirtyZoom = true;
+    }
+
+    /**
+     * Returns the zoom to be applied to the magnified view region copied to the magnifier.
      * If the zoom is x and the magnifier window size is (width, height), the original size
-     * of the content copied in the magnifier will be (width / x, height / x).
+     * of the content being magnified will be (width / x, height / x).
+     * @return the zoom applied to the content
+     * @see Magnifier.Builder#setZoom(float)
      */
     public float getZoom() {
         return mZoom;
     }
 
     /**
-     * @hide
+     * @return the elevation set for the magnifier window, in pixels
+     * @see Magnifier.Builder#setElevation(float)
+     */
+    @Px
+    public float getElevation() {
+        return mWindowElevation;
+    }
+
+    /**
+     * @return the corner radius of the magnifier window, in pixels
+     * @see Magnifier.Builder#setCornerRadius(float)
+     */
+    @Px
+    public float getCornerRadius() {
+        return mWindowCornerRadius;
+    }
+
+    /**
+     * Returns the horizontal offset, in pixels, to be applied to the source center position
+     * to obtain the magnifier center position when {@link #show(float, float)} is called.
+     * The value is ignored when {@link #show(float, float, float, float)} is used instead.
      *
-     * @return The top left coordinates of the magnifier, relative to the parent window.
+     * @return the default horizontal offset between the source center and the magnifier
+     * @see Magnifier.Builder#setDefaultSourceToMagnifierOffset(int, int)
+     * @see Magnifier#show(float, float)
+     */
+    @Px
+    public int getDefaultHorizontalSourceToMagnifierOffset() {
+        return mDefaultHorizontalSourceToMagnifierOffset;
+    }
+
+    /**
+     * Returns the vertical offset, in pixels, to be applied to the source center position
+     * to obtain the magnifier center position when {@link #show(float, float)} is called.
+     * The value is ignored when {@link #show(float, float, float, float)} is used instead.
+     *
+     * @return the default vertical offset between the source center and the magnifier
+     * @see Magnifier.Builder#setDefaultSourceToMagnifierOffset(int, int)
+     * @see Magnifier#show(float, float)
+     */
+    @Px
+    public int getDefaultVerticalSourceToMagnifierOffset() {
+        return mDefaultVerticalSourceToMagnifierOffset;
+    }
+
+    /**
+     * Returns the top left coordinates of the magnifier, relative to the surface of the
+     * main application window. They will be determined by the coordinates of the last
+     * {@link #show(float, float)} or {@link #show(float, float, float, float)} call, adjusted
+     * to take into account any potential clamping behavior. The method can be used immediately
+     * after a #show call to find out where the magnifier will be positioned. However, the
+     * position of the magnifier will not be updated in the same frame due to the async
+     * copying of the content copying and of the magnifier rendering.
+     * The method will return {@code null} if #show has not yet been called, or if the last
+     * operation performed was a #dismiss.
+     *
+     * @return the top left coordinates of the magnifier
      */
     @Nullable
-    public Point getWindowCoords() {
+    public Point getPosition() {
         if (mWindow == null) {
             return null;
         }
-        final Rect surfaceInsets = mView.getViewRootImpl().mWindowAttributes.surfaceInsets;
-        return new Point(mWindow.mLastDrawContentPositionX - surfaceInsets.left,
-                mWindow.mLastDrawContentPositionY - surfaceInsets.top);
+        return new Point(getCurrentClampedWindowCoordinates());
+    }
+
+    /**
+     * Returns the top left coordinates of the magnifier source (i.e. the view region going to
+     * be magnified and copied to the magnifier), relative to the surface the content is copied
+     * from. The content will be copied:
+     * - if the magnified view is a {@link SurfaceView}, from the surface backing it
+     * - otherwise, from the surface of the main application window
+     * The method will return {@code null} if #show has not yet been called, or if the last
+     * operation performed was a #dismiss.
+     *
+     * @return the top left coordinates of the magnifier source
+     */
+    @Nullable
+    public Point getSourcePosition() {
+        if (mWindow == null) {
+            return null;
+        }
+        return new Point(mPixelCopyRequestRect.left, mPixelCopyRequestRect.top);
     }
 
     /**
@@ -430,6 +556,7 @@
                 sPixelCopyHandlerThread.getThreadHandler());
         mPrevStartCoordsInSurface.x = startXInSurface;
         mPrevStartCoordsInSurface.y = startYInSurface;
+        mDirtyZoom = false;
     }
 
     /**
@@ -750,6 +877,134 @@
         }
     }
 
+    /**
+     * Builder class for {@link Magnifier} objects.
+     */
+    public static class Builder {
+        private @NonNull View mView;
+        private @Px @IntRange(from = 0) int mWidth;
+        private @Px @IntRange(from = 0) int mHeight;
+        private float mZoom;
+        private @FloatRange(from = 0f) float mElevation;
+        private @FloatRange(from = 0f) float mCornerRadius;
+        private int mHorizontalDefaultSourceToMagnifierOffset;
+        private int mVerticalDefaultSourceToMagnifierOffset;
+
+        /**
+         * Construct a new builder for {@link Magnifier} objects.
+         * @param view the view this magnifier is attached to
+         */
+        public Builder(@NonNull View view) {
+            mView = Preconditions.checkNotNull(view);
+            applyDefaults();
+        }
+
+        private void applyDefaults() {
+            final Context context = mView.getContext();
+            final TypedArray a = context.obtainStyledAttributes(null, R.styleable.Magnifier,
+                    R.attr.magnifierStyle, 0);
+            mWidth = a.getDimensionPixelSize(R.styleable.Magnifier_magnifierWidth, 0);
+            mHeight = a.getDimensionPixelSize(R.styleable.Magnifier_magnifierHeight, 0);
+            mElevation = a.getDimension(R.styleable.Magnifier_magnifierElevation, 0);
+            mCornerRadius = getDeviceDefaultDialogCornerRadius();
+            mZoom = a.getFloat(R.styleable.Magnifier_magnifierZoom, 0);
+            mHorizontalDefaultSourceToMagnifierOffset =
+                    a.getDimensionPixelSize(R.styleable.Magnifier_magnifierHorizontalOffset, 0);
+            mVerticalDefaultSourceToMagnifierOffset =
+                    a.getDimensionPixelSize(R.styleable.Magnifier_magnifierVerticalOffset, 0);
+            a.recycle();
+        }
+
+        /**
+         * Returns the device default theme dialog corner radius attribute.
+         * We retrieve this from the device default theme to avoid
+         * using the values set in the custom application themes.
+         */
+        private float getDeviceDefaultDialogCornerRadius() {
+            final Context deviceDefaultContext =
+                    new ContextThemeWrapper(mView.getContext(), R.style.Theme_DeviceDefault);
+            final TypedArray ta = deviceDefaultContext.obtainStyledAttributes(
+                    new int[]{android.R.attr.dialogCornerRadius});
+            final float dialogCornerRadius = ta.getDimension(0, 0);
+            ta.recycle();
+            return dialogCornerRadius;
+        }
+
+        /**
+         * Sets the size of the magnifier window, in pixels. Defaults to (100dp, 48dp).
+         * Note that the size of the content being magnified and copied to the magnifier
+         * will be computed as (window width / zoom, window height / zoom).
+         * @param width the window width to be set
+         * @param height the window height to be set
+         */
+        public Builder setSize(@Px @IntRange(from = 0) int width,
+                @Px @IntRange(from = 0) int height) {
+            Preconditions.checkArgumentPositive(width, "Width should be positive");
+            Preconditions.checkArgumentPositive(height, "Height should be positive");
+            mWidth = width;
+            mHeight = height;
+            return this;
+        }
+
+        /**
+         * Sets the zoom to be applied to the chosen content before being copied to the magnifier.
+         * A content of size (content_width, content_height) will be magnified to
+         * (content_width * zoom, content_height * zoom), which will coincide with the size
+         * of the magnifier. A zoom of 1 will translate to no magnification (the content will
+         * be just copied to the magnifier with no scaling). The zoom defaults to 1.25.
+         * @param zoom the zoom to be set
+         */
+        public Builder setZoom(@FloatRange(from = 0f) float zoom) {
+            Preconditions.checkArgumentPositive(zoom, "Zoom should be positive");
+            mZoom = zoom;
+            return this;
+        }
+
+        /**
+         * Sets the elevation of the magnifier window, in pixels. Defaults to 4dp.
+         * @param elevation the elevation to be set
+         */
+        public Builder setElevation(@Px @FloatRange(from = 0) float elevation) {
+            Preconditions.checkArgumentNonNegative(elevation, "Elevation should be non-negative");
+            mElevation = elevation;
+            return this;
+        }
+
+        /**
+         * Sets the corner radius of the magnifier window, in pixels.
+         * Defaults to the corner radius defined in the device default theme.
+         * @param cornerRadius the corner radius to be set
+         */
+        public Builder setCornerRadius(@Px @FloatRange(from = 0) float cornerRadius) {
+            Preconditions.checkArgumentNonNegative(cornerRadius,
+                    "Corner radius should be non-negative");
+            mCornerRadius = cornerRadius;
+            return this;
+        }
+
+        /**
+         * Sets an offset, in pixels, that should be added to the content source center to obtain
+         * the position of the magnifier window, when the {@link #show(float, float)}
+         * method is called. The offset is ignored when {@link #show(float, float, float, float)}
+         * is used. The offset can be negative, and it defaults to (0dp, -42dp).
+         * @param horizontalOffset the horizontal component of the offset
+         * @param verticalOffset the vertical component of the offset
+         */
+        public Builder setDefaultSourceToMagnifierOffset(@Px int horizontalOffset,
+                @Px int verticalOffset) {
+            mHorizontalDefaultSourceToMagnifierOffset = horizontalOffset;
+            mVerticalDefaultSourceToMagnifierOffset = verticalOffset;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Magnifier} instance based on the configuration of this {@link Builder}.
+         */
+        public @NonNull Magnifier build() {
+            return new Magnifier(this);
+        }
+    }
+
     // The rest of the file consists of test APIs.
 
     /**
@@ -788,20 +1043,18 @@
     }
 
     /**
-     * @return the position of the magnifier window relative to the screen
+     * @return the content to be magnified, as bitmap
      *
      * @hide
      */
     @TestApi
-    public Rect getWindowPositionOnScreen() {
-        final int[] viewLocationOnScreen = new int[2];
-        mView.getLocationOnScreen(viewLocationOnScreen);
-        final int[] viewLocationInSurface = new int[2];
-        mView.getLocationInSurface(viewLocationInSurface);
-
-        final int left = mWindowCoords.x + viewLocationOnScreen[0] - viewLocationInSurface[0];
-        final int top = mWindowCoords.y + viewLocationOnScreen[1] - viewLocationInSurface[1];
-        return new Rect(left, top, left + mWindowWidth, top + mWindowHeight);
+    public @Nullable Bitmap getOriginalContent() {
+        if (mWindow == null) {
+            return null;
+        }
+        synchronized (mWindow.mLock) {
+            return Bitmap.createBitmap(mWindow.mBitmap);
+        }
     }
 
     /**
diff --git a/core/java/com/android/internal/app/IMediaContainerService.aidl b/core/java/com/android/internal/app/IMediaContainerService.aidl
index ef30cd1..3540b07 100644
--- a/core/java/com/android/internal/app/IMediaContainerService.aidl
+++ b/core/java/com/android/internal/app/IMediaContainerService.aidl
@@ -25,6 +25,5 @@
 
     PackageInfoLite getMinimalPackageInfo(String packagePath, int flags, String abiOverride);
     ObbInfo getObbInfo(String filename);
-    void clearDirectory(String directory);
     long calculateInstalledSize(String packagePath, String abiOverride);
 }
diff --git a/core/java/com/android/internal/content/FileSystemProvider.java b/core/java/com/android/internal/content/FileSystemProvider.java
index 0c6f832..b33a5c4 100644
--- a/core/java/com/android/internal/content/FileSystemProvider.java
+++ b/core/java/com/android/internal/content/FileSystemProvider.java
@@ -74,10 +74,6 @@
 
     private Handler mHandler;
 
-    private static final String MIMETYPE_JPEG = "image/jpeg";
-    private static final String MIMETYPE_JPG = "image/jpg";
-    private static final String MIMETYPE_OCTET_STREAM = "application/octet-stream";
-
     protected abstract File getFileForDocId(String docId, boolean visible)
             throws FileNotFoundException;
 
@@ -433,7 +429,7 @@
                     return mime;
                 }
             }
-            return MIMETYPE_OCTET_STREAM;
+            return ContentResolver.MIME_TYPE_DEFAULT;
         }
     }
 
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 07f74f0..d0795c9 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -11725,7 +11725,6 @@
                         Slog.d(TAG, "UID=" + uid + " rx_bytes=" + rxBytes + " rx_time=" + timeRxMs);
                     }
                     counter.getRxTimeCounter().addCountLocked(timeRxMs);
-                    leftOverRxTimeMs -= timeRxMs;
                 }
 
                 if (totalTxBytes > 0 && txBytes > 0) {
@@ -11734,7 +11733,6 @@
                         Slog.d(TAG, "UID=" + uid + " tx_bytes=" + txBytes + " tx_time=" + timeTxMs);
                     }
                     counter.getTxTimeCounters()[0].addCountLocked(timeTxMs);
-                    leftOverTxTimeMs -= timeTxMs;
                 }
             }
         }
diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 616520f..c4214cf 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -141,7 +141,7 @@
     void showShutdownUi(boolean isReboot, String reason);
 
     // Used to show the dialog when BiometricService starts authentication
-    void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver);
+    void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type);
     // Used to hide the dialog when a biometric is authenticated
     void onBiometricAuthenticated();
     // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc
diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
index b3af147..e48e733 100644
--- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
@@ -91,7 +91,7 @@
     void showPinningEscapeToast();
 
     // Used to show the dialog when BiometricService starts authentication
-    void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver);
+    void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type);
     // Used to hide the dialog when a biometric is authenticated
     void onBiometricAuthenticated();
     // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc
diff --git a/core/java/com/android/internal/util/Preconditions.java b/core/java/com/android/internal/util/Preconditions.java
index 91c76af..2c6a0e0 100644
--- a/core/java/com/android/internal/util/Preconditions.java
+++ b/core/java/com/android/internal/util/Preconditions.java
@@ -192,7 +192,7 @@
     }
 
     /**
-     * Ensures that that the argument numeric value is non-negative.
+     * Ensures that that the argument numeric value is non-negative (greater than or equal to 0).
      *
      * @param value a numeric int value
      * @param errorMessage the exception message to use if the check fails
@@ -209,7 +209,7 @@
     }
 
     /**
-     * Ensures that that the argument numeric value is non-negative.
+     * Ensures that that the argument numeric value is non-negative (greater than or equal to 0).
      *
      * @param value a numeric int value
      *
@@ -225,7 +225,7 @@
     }
 
     /**
-     * Ensures that that the argument numeric value is non-negative.
+     * Ensures that that the argument numeric value is non-negative (greater than or equal to 0).
      *
      * @param value a numeric long value
      * @return the validated numeric value
@@ -240,7 +240,7 @@
     }
 
     /**
-     * Ensures that that the argument numeric value is non-negative.
+     * Ensures that that the argument numeric value is non-negative (greater than or equal to 0).
      *
      * @param value a numeric long value
      * @param errorMessage the exception message to use if the check fails
@@ -256,7 +256,7 @@
     }
 
     /**
-     * Ensures that that the argument numeric value is positive.
+     * Ensures that that the argument numeric value is positive (greater than 0).
      *
      * @param value a numeric int value
      * @param errorMessage the exception message to use if the check fails
@@ -272,6 +272,36 @@
     }
 
     /**
+     * Ensures that the argument floating point value is non-negative (greater than or equal to 0).
+     * @param value a floating point value
+     * @param errorMessage the exteption message to use if the check fails
+     * @return the validated numeric value
+     * @throws IllegalArgumentException if {@code value} was negative
+     */
+    public static float checkArgumentNonNegative(final float value, final String errorMessage) {
+        if (value < 0) {
+            throw new IllegalArgumentException(errorMessage);
+        }
+
+        return value;
+    }
+
+    /**
+     * Ensures that the argument floating point value is positive (greater than 0).
+     * @param value a floating point value
+     * @param errorMessage the exteption message to use if the check fails
+     * @return the validated numeric value
+     * @throws IllegalArgumentException if {@code value} was not positive
+     */
+    public static float checkArgumentPositive(final float value, final String errorMessage) {
+        if (value <= 0) {
+            throw new IllegalArgumentException(errorMessage);
+        }
+
+        return value;
+    }
+
+    /**
      * Ensures that the argument floating point value is a finite number.
      *
      * <p>A finite number is defined to be both representable (that is, not NaN) and
diff --git a/core/java/com/android/internal/view/IInputMethodClient.aidl b/core/java/com/android/internal/view/IInputMethodClient.aidl
index ffa9f75..5c6dea8 100644
--- a/core/java/com/android/internal/view/IInputMethodClient.aidl
+++ b/core/java/com/android/internal/view/IInputMethodClient.aidl
@@ -23,7 +23,6 @@
  * itself and receive information about changes to the global manager state.
  */
 oneway interface IInputMethodClient {
-    void setUsingInputMethod(boolean state);
     void onBindMethod(in InputBindResult res);
     // unbindReason corresponds to InputMethodClient.UnbindReason.
     void onUnbindMethod(int sequence, int unbindReason);
diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl
index 06726bd..4b004e2 100644
--- a/core/java/com/android/internal/view/IInputMethodManager.aidl
+++ b/core/java/com/android/internal/view/IInputMethodManager.aidl
@@ -43,9 +43,6 @@
     // TODO: We should change the return type from List to List<Parcelable>
     // Currently there is a bug that aidl doesn't accept List<Parcelable>
     List getShortcutInputMethodsAndSubtypes();
-    void addClient(in IInputMethodClient client,
-            in IInputContext inputContext, int uid, int pid);
-    void removeClient(in IInputMethodClient client);
 
     void finishInput(in IInputMethodClient client);
     boolean showSoftInput(in IInputMethodClient client, int flags,
diff --git a/core/jni/OWNERS b/core/jni/OWNERS
index ce79049..a365a56 100644
--- a/core/jni/OWNERS
+++ b/core/jni/OWNERS
@@ -1,12 +1,6 @@
 # Camera
-per-file *Camera*,*camera* = cychen@google.com
-per-file *Camera*,*camera* = epeev@google.com
-per-file *Camera*,*camera* = etalvala@google.com
-per-file *Camera*,*camera* = shuzhenwang@google.com
-per-file *Camera*,*camera* = yinchiayeh@google.com
-per-file *Camera*,*camera* = zhijunhe@google.com
+per-file *Camera*,*camera* = cychen@google.com, epeev@google.com, etalvala@google.com
+per-file *Camera*,*camera* = shuzhenwang@google.com, yinchiayeh@google.com, zhijunhe@google.com
 
 # Connectivity
-per-file android_net_*=ek@google.com
-per-file android_net_*=lorenzo@google.com
-per-file android_net_*=satk@google.com
+per-file android_net_* = ek@google.com, lorenzo@google.com, satk@google.com
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 638b3ea..ccbe0ee 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -343,51 +343,47 @@
                 }
                 is_swappable = true;
             } else if (strncmp(name, "/dev/", 5) == 0) {
+                whichHeap = HEAP_UNKNOWN_DEV;
                 if (strncmp(name, "/dev/kgsl-3d0", 13) == 0) {
                     whichHeap = HEAP_GL_DEV;
-                } else if (strncmp(name, "/dev/ashmem", 11) == 0) {
-                    if (strncmp(name, "/dev/ashmem/dalvik-", 19) == 0) {
-                        whichHeap = HEAP_DALVIK_OTHER;
-                        if (strstr(name, "/dev/ashmem/dalvik-LinearAlloc") == name) {
-                            subHeap = HEAP_DALVIK_OTHER_LINEARALLOC;
-                        } else if ((strstr(name, "/dev/ashmem/dalvik-alloc space") == name) ||
-                                   (strstr(name, "/dev/ashmem/dalvik-main space") == name)) {
-                            // This is the regular Dalvik heap.
-                            whichHeap = HEAP_DALVIK;
-                            subHeap = HEAP_DALVIK_NORMAL;
-                        } else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name ||
-                                   strstr(name, "/dev/ashmem/dalvik-free list large object space")
-                                       == name) {
-                            whichHeap = HEAP_DALVIK;
-                            subHeap = HEAP_DALVIK_LARGE;
-                        } else if (strstr(name, "/dev/ashmem/dalvik-non moving space") == name) {
-                            whichHeap = HEAP_DALVIK;
-                            subHeap = HEAP_DALVIK_NON_MOVING;
-                        } else if (strstr(name, "/dev/ashmem/dalvik-zygote space") == name) {
-                            whichHeap = HEAP_DALVIK;
-                            subHeap = HEAP_DALVIK_ZYGOTE;
-                        } else if (strstr(name, "/dev/ashmem/dalvik-indirect ref") == name) {
-                            subHeap = HEAP_DALVIK_OTHER_INDIRECT_REFERENCE_TABLE;
-                        } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name ||
-                                   strstr(name, "/dev/ashmem/dalvik-data-code-cache") == name) {
-                            subHeap = HEAP_DALVIK_OTHER_CODE_CACHE;
-                        } else if (strstr(name, "/dev/ashmem/dalvik-CompilerMetadata") == name) {
-                            subHeap = HEAP_DALVIK_OTHER_COMPILER_METADATA;
-                        } else {
-                            subHeap = HEAP_DALVIK_OTHER_ACCOUNTING;  // Default to accounting.
-                        }
-                    } else if (strncmp(name, "/dev/ashmem/CursorWindow", 24) == 0) {
-                        whichHeap = HEAP_CURSOR;
-                    } else if (strncmp(name, "/dev/ashmem/libc malloc", 23) == 0) {
-                        whichHeap = HEAP_NATIVE;
-                    } else {
-                        whichHeap = HEAP_ASHMEM;
-                    }
-                } else {
-                    whichHeap = HEAP_UNKNOWN_DEV;
+                } else if (strncmp(name, "/dev/ashmem/CursorWindow", 24) == 0) {
+                    whichHeap = HEAP_CURSOR;
+                } else if (strncmp(name, "/dev/ashmem", 11)) {
+                    whichHeap = HEAP_ASHMEM;
                 }
             } else if (strncmp(name, "[anon:", 6) == 0) {
                 whichHeap = HEAP_UNKNOWN;
+                if (strncmp(name, "[anon:dalvik-", 13) == 0) {
+                    whichHeap = HEAP_DALVIK_OTHER;
+                    if (strstr(name, "[anon:dalvik-LinearAlloc") == name) {
+                        subHeap = HEAP_DALVIK_OTHER_LINEARALLOC;
+                    } else if ((strstr(name, "[anon:dalvik-alloc space") == name) ||
+                               (strstr(name, "[anon:dalvik-main space") == name)) {
+                        // This is the regular Dalvik heap.
+                        whichHeap = HEAP_DALVIK;
+                        subHeap = HEAP_DALVIK_NORMAL;
+                    } else if (strstr(name, "[anon:dalvik-large object space") == name ||
+                               strstr(name, "[anon:dalvik-free list large object space")
+                                   == name) {
+                        whichHeap = HEAP_DALVIK;
+                        subHeap = HEAP_DALVIK_LARGE;
+                    } else if (strstr(name, "[anon:dalvik-non moving space") == name) {
+                        whichHeap = HEAP_DALVIK;
+                        subHeap = HEAP_DALVIK_NON_MOVING;
+                    } else if (strstr(name, "[anon:dalvik-zygote space") == name) {
+                        whichHeap = HEAP_DALVIK;
+                        subHeap = HEAP_DALVIK_ZYGOTE;
+                    } else if (strstr(name, "[anon:dalvik-indirect ref") == name) {
+                        subHeap = HEAP_DALVIK_OTHER_INDIRECT_REFERENCE_TABLE;
+                    } else if (strstr(name, "[anon:dalvik-jit-code-cache") == name ||
+                               strstr(name, "[anon:dalvik-data-code-cache") == name) {
+                        subHeap = HEAP_DALVIK_OTHER_CODE_CACHE;
+                    } else if (strstr(name, "[anon:dalvik-CompilerMetadata") == name) {
+                        subHeap = HEAP_DALVIK_OTHER_COMPILER_METADATA;
+                    } else {
+                        subHeap = HEAP_DALVIK_OTHER_ACCOUNTING;  // Default to accounting.
+                    }
+                }
             } else if (nameLen > 0) {
                 whichHeap = HEAP_UNKNOWN_MAP;
             } else if (start == prevEnd && prevHeap == HEAP_SO) {
@@ -602,7 +598,7 @@
 
     struct graphics_memory_pss graphics_mem;
     if (read_memtrack_memory(pid, &graphics_mem) == 0) {
-        pss = uss = memtrack = graphics_mem.graphics + graphics_mem.gl + graphics_mem.other;
+        pss = uss = rss = memtrack = graphics_mem.graphics + graphics_mem.gl + graphics_mem.other;
     }
 
     {
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 02d6adb..743b9f6 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -449,16 +449,6 @@
     transaction->setCrop_legacy(ctrl, crop);
 }
 
-static void nativeSetFinalCrop(JNIEnv* env, jclass clazz, jlong transactionObj,
-        jlong nativeObject,
-        jint l, jint t, jint r, jint b) {
-    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
-
-    SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);
-    Rect crop(l, t, r, b);
-    transaction->setFinalCrop_legacy(ctrl, crop);
-}
-
 static void nativeSetLayerStack(JNIEnv* env, jclass clazz, jlong transactionObj,
         jlong nativeObject, jint layerStack) {
     auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
@@ -967,8 +957,6 @@
             (void*)nativeSetFlags },
     {"nativeSetWindowCrop", "(JJIIII)V",
             (void*)nativeSetWindowCrop },
-    {"nativeSetFinalCrop", "(JJIIII)V",
-            (void*)nativeSetFinalCrop },
     {"nativeSetLayerStack", "(JJI)V",
             (void*)nativeSetLayerStack },
     {"nativeGetBuiltInDisplay", "(I)Landroid/os/IBinder;",
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto
index a8b23dd..f1bd63b 100644
--- a/core/proto/android/server/windowmanagerservice.proto
+++ b/core/proto/android/server/windowmanagerservice.proto
@@ -298,9 +298,10 @@
     optional bool removed = 36;
     optional bool is_on_screen = 37;
     optional bool is_visible = 38;
-    optional bool pending_forced_seamless_rotation = 39;
-    optional int64 finished_forced_seamless_rotation_frame = 40;
+    optional bool pending_seamless_rotation = 39;
+    optional int64 finished_seamless_rotation_frame = 40;
     optional WindowFramesProto window_frames = 41;
+    optional bool force_seamless_rotation = 42;
 }
 
 message IdentifierProto {
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 8f176e8..5258518 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3238,11 +3238,13 @@
     <permission android:name="android.permission.ACCESS_SURFACE_FLINGER"
         android:protectionLevel="signature" />
 
-    <!-- @SystemApi Allows an application to take screen shots and more generally
+    <!-- Allows an application to take screen shots and more generally
          get access to the frame buffer data.
-         <p>Not for use by third-party applications. -->
+         <p>Not for use by third-party applications.
+          @hide
+          @removed -->
     <permission android:name="android.permission.READ_FRAME_BUFFER"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to use InputFlinger's low level features.
          @hide -->
@@ -3338,15 +3340,19 @@
     <permission android:name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS"
         android:protectionLevel="signature|privileged" />
 
-    <!-- @SystemApi Allows an application to capture video output.
-         <p>Not for use by third-party applications.</p> -->
+    <!-- Allows an application to capture video output.
+         <p>Not for use by third-party applications.</p>
+          @hide
+          @removed -->
     <permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature" />
 
-    <!-- @SystemApi Allows an application to capture secure video output.
-         <p>Not for use by third-party applications.</p> -->
+    <!-- Allows an application to capture secure video output.
+         <p>Not for use by third-party applications.</p>
+          @hide
+          @removed -->
     <permission android:name="android.permission.CAPTURE_SECURE_VIDEO_OUTPUT"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to know what content is playing and control its playback.
          <p>Not for use by third-party applications due to privacy of media consumption</p>  -->
@@ -3742,9 +3748,13 @@
     <permission android:name="android.permission.RESET_FINGERPRINT_LOCKOUT"
         android:protectionLevel="signature" />
 
-    <!-- Allows managing (adding, removing) facial templates. Reserved for the system. @hide -->
-    <permission android:name="android.permission.MANAGE_FACE"
-        android:protectionLevel="signature|privileged" />
+    <!-- Allows direct access to the <Biometric>Service interfaces. Reserved for the system. @hide -->
+    <permission android:name="android.permission.MANAGE_BIOMETRIC"
+        android:protectionLevel="signature" />
+
+    <!-- Allows direct access to the <Biometric>Service authentication methods. Reserved for the system. @hide -->
+    <permission android:name="android.permission.USE_BIOMETRIC_INTERNAL"
+        android:protectionLevel="signature" />
 
     <!-- Allows an app to reset face authentication attempt counter. Reserved for the system. @hide -->
     <permission android:name="android.permission.RESET_FACE_LOCKOUT"
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index 5e6c8fa..e40a546 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -1128,7 +1128,7 @@
     <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> sigue sin funcionar"</string>
     <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> sigue sin funcionar"</string>
     <string name="aerr_restart" msgid="7581308074153624475">"Volver a abrir la aplicación"</string>
-    <string name="aerr_report" msgid="5371800241488400617">"Enviar sugerencias"</string>
+    <string name="aerr_report" msgid="5371800241488400617">"Enviar comentarios"</string>
     <string name="aerr_close" msgid="2991640326563991340">"Cerrar"</string>
     <string name="aerr_mute" msgid="1974781923723235953">"Silenciar hasta que se reinicie el dispositivo"</string>
     <string name="aerr_wait" msgid="3199956902437040261">"Esperar"</string>
diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml
index 9c961e2..c257008 100644
--- a/core/res/res/values-mr/strings.xml
+++ b/core/res/res/values-mr/strings.xml
@@ -721,7 +721,7 @@
     <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string>
     <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"कार्य मोबाईल"</string>
     <string name="phoneTypeWorkPager" msgid="649938731231157056">"कार्य पेजर"</string>
-    <string name="phoneTypeAssistant" msgid="5596772636128562884">"साहाय्यक"</string>
+    <string name="phoneTypeAssistant" msgid="5596772636128562884">"असिस्टंट"</string>
     <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string>
     <string name="eventTypeCustom" msgid="7837586198458073404">"कस्टम"</string>
     <string name="eventTypeBirthday" msgid="2813379844211390740">"वाढदिवस"</string>
@@ -754,7 +754,7 @@
     <string name="orgTypeOther" msgid="3951781131570124082">"अन्य"</string>
     <string name="orgTypeCustom" msgid="225523415372088322">"कस्टम"</string>
     <string name="relationTypeCustom" msgid="3542403679827297300">"कस्टम"</string>
-    <string name="relationTypeAssistant" msgid="6274334825195379076">"साहाय्यक"</string>
+    <string name="relationTypeAssistant" msgid="6274334825195379076">"असिस्टंट"</string>
     <string name="relationTypeBrother" msgid="8757913506784067713">"भाऊ"</string>
     <string name="relationTypeChild" msgid="1890746277276881626">"मूल"</string>
     <string name="relationTypeDomesticPartner" msgid="6904807112121122133">"घरातील जोडीदार"</string>
diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml
index 00143b9..ba58742 100644
--- a/core/res/res/values-ta/strings.xml
+++ b/core/res/res/values-ta/strings.xml
@@ -300,18 +300,12 @@
     <string name="permgrouplab_sensors" msgid="416037179223226722">"உடல் சென்சார்கள்"</string>
     <string name="permgroupdesc_sensors" msgid="7147968539346634043">"உங்கள் உடல் இயக்கம் பற்றி உணர்விகள் கூறும் தகவலைப் பார்க்கலாம்"</string>
     <string name="permgrouprequest_sensors" msgid="6349806962814556786">"உங்கள் உடலியக்கக் குறிகள் பற்றிய சென்சார் தரவை அணுகுவதற்கு &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; பயன்பாட்டை அனுமதிக்கவா?"</string>
-    <!-- no translation found for permgrouplab_aural (965607064083134896) -->
-    <skip />
-    <!-- no translation found for permgroupdesc_aural (4870189506255958055) -->
-    <skip />
-    <!-- no translation found for permgrouprequest_aural (6787926123071735620) -->
-    <skip />
-    <!-- no translation found for permgrouplab_visual (8030190588123857921) -->
-    <skip />
-    <!-- no translation found for permgroupdesc_visual (3415827902566663546) -->
-    <skip />
-    <!-- no translation found for permgrouprequest_visual (6907523945030290376) -->
-    <skip />
+    <string name="permgrouplab_aural" msgid="965607064083134896">"இசை"</string>
+    <string name="permgroupdesc_aural" msgid="4870189506255958055">"இசையைக் கேட்கலாம்"</string>
+    <string name="permgrouprequest_aural" msgid="6787926123071735620">"இசையை அணுக &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ஆப்ஸை அனுமதிக்கவா?"</string>
+    <string name="permgrouplab_visual" msgid="8030190588123857921">"படங்கள் &amp; வீடியோக்கள்"</string>
+    <string name="permgroupdesc_visual" msgid="3415827902566663546">"படங்கள் &amp; வீடியோக்களைப் பார்க்கலாம்"</string>
+    <string name="permgrouprequest_visual" msgid="6907523945030290376">"படங்கள் &amp; வீடியோக்களை அணுக &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ஆப்ஸை அனுமதிக்கவா?"</string>
     <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"சாளர உள்ளடக்கத்தைப் பெறும்"</string>
     <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"நீங்கள் பணியாற்றிக் கொண்டிருக்கும் சாளரத்தின் உள்ளடக்கத்தைப் பார்க்கலாம்."</string>
     <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"தொடுவதன் மூலம் அறிவதை இயக்கும்"</string>
@@ -506,34 +500,20 @@
     <string name="permdesc_manageFingerprint" msgid="178208705828055464">"பயன்படுத்துவதற்காக, கைரேகை டெம்ப்ளேட்களைச் சேர்க்க மற்றும் நீக்குவதற்கான செயல்முறைகளை இயக்குவதற்குப் பயன்பாட்டை அனுமதிக்கும்."</string>
     <string name="permlab_useFingerprint" msgid="3150478619915124905">"கைரேகை வன்பொருளைப் பயன்படுத்து"</string>
     <string name="permdesc_useFingerprint" msgid="9165097460730684114">"அங்கீகரிப்பதற்கு, கைரேகை வன்பொருளைப் பயன்படுத்த, பயன்பாட்டை அனுமதிக்கும்"</string>
-    <!-- no translation found for permlab_audioRead (6617225220728465565) -->
-    <skip />
-    <!-- no translation found for permdesc_audioRead (5034032570243484805) -->
-    <skip />
-    <!-- no translation found for permlab_audioWrite (2661772059799779292) -->
-    <skip />
-    <!-- no translation found for permdesc_audioWrite (8888544708166230494) -->
-    <skip />
-    <!-- no translation found for permlab_videoRead (9182618678674737229) -->
-    <skip />
-    <!-- no translation found for permdesc_videoRead (7045676429859396194) -->
-    <skip />
-    <!-- no translation found for permlab_videoWrite (128769316366746446) -->
-    <skip />
-    <!-- no translation found for permdesc_videoWrite (5448565757490640841) -->
-    <skip />
-    <!-- no translation found for permlab_imagesRead (3015078545742665304) -->
-    <skip />
-    <!-- no translation found for permdesc_imagesRead (3144263806038695580) -->
-    <skip />
-    <!-- no translation found for permlab_imagesWrite (3391306186247235510) -->
-    <skip />
-    <!-- no translation found for permdesc_imagesWrite (7073662756617474375) -->
-    <skip />
-    <!-- no translation found for permlab_mediaLocation (8675148183726247864) -->
-    <skip />
-    <!-- no translation found for permdesc_mediaLocation (2237023389178865130) -->
-    <skip />
+    <string name="permlab_audioRead" msgid="6617225220728465565">"இசைத் தொகுப்பை அணுகுதல்"</string>
+    <string name="permdesc_audioRead" msgid="5034032570243484805">"உங்களின் இசைத் தொகுப்பை அணுக ஆப்ஸை அனுமதிக்கும்."</string>
+    <string name="permlab_audioWrite" msgid="2661772059799779292">"இசைத் தொகுப்பை மாற்றுதல்"</string>
+    <string name="permdesc_audioWrite" msgid="8888544708166230494">"உங்களின் இசைத் தொகுப்பை மாற்ற ஆப்ஸை அனுமதிக்கும்."</string>
+    <string name="permlab_videoRead" msgid="9182618678674737229">"வீடியோ தொகுப்பை அணுகுதல்"</string>
+    <string name="permdesc_videoRead" msgid="7045676429859396194">"உங்களின் வீடியோ தொகுப்பை அணுக ஆப்ஸை அனுமதிக்கும்."</string>
+    <string name="permlab_videoWrite" msgid="128769316366746446">"வீடியோ தொகுப்பை மாற்றுதல்"</string>
+    <string name="permdesc_videoWrite" msgid="5448565757490640841">"உங்களின் வீடியோ தொகுப்பை மாற்ற ஆப்ஸை அனுமதிக்கும்."</string>
+    <string name="permlab_imagesRead" msgid="3015078545742665304">"படத் தொகுப்பை அணுகுதல்"</string>
+    <string name="permdesc_imagesRead" msgid="3144263806038695580">"உங்களின் படத் தொகுப்பை அணுக ஆப்ஸை அனுமதிக்கும்."</string>
+    <string name="permlab_imagesWrite" msgid="3391306186247235510">"படத் தொகுப்பை மாற்றுதல்"</string>
+    <string name="permdesc_imagesWrite" msgid="7073662756617474375">"உங்களின் படத் தொகுப்பை மாற்ற ஆப்ஸை அனுமதிக்கும்."</string>
+    <string name="permlab_mediaLocation" msgid="8675148183726247864">"மீடியா தொகுப்பிலிருந்து இடங்களை அறிதல்"</string>
+    <string name="permdesc_mediaLocation" msgid="2237023389178865130">"உங்களின் மீடியா தொகுப்பிலிருந்து இடங்களை அறிந்துகொள்ள ஆப்ஸை அனுமதிக்கும்."</string>
     <string name="fingerprint_acquired_partial" msgid="735082772341716043">"கைரேகையை ஓரளவுதான் கண்டறிய முடிந்தது. மீண்டும் முயலவும்."</string>
     <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"கைரேகையைச் செயலாக்க முடியவில்லை. மீண்டும் முயலவும்."</string>
     <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"கைரேகை உணர்வியில் தூசி உள்ளது. சுத்தம் செய்து, முயலவும்."</string>
@@ -1913,18 +1893,13 @@
     <string name="autofill_save_title_with_type" msgid="8637809388029313305">"<xliff:g id="TYPE">%1$s</xliff:g>ஐ &lt;b&gt;<xliff:g id="LABEL">%2$s</xliff:g>&lt;/b&gt; இல் சேமிக்கவா?"</string>
     <string name="autofill_save_title_with_2types" msgid="5214035651838265325">"<xliff:g id="TYPE_0">%1$s</xliff:g> மற்றும் <xliff:g id="TYPE_1">%2$s</xliff:g>ஐ &lt;b&gt;<xliff:g id="LABEL">%3$s</xliff:g>&lt;/b&gt; இல் சேமிக்கவா?"</string>
     <string name="autofill_save_title_with_3types" msgid="6943161834231458441">"<xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g>, <xliff:g id="TYPE_2">%3$s</xliff:g> ஆகியவற்றை &lt;b&gt;<xliff:g id="LABEL">%4$s</xliff:g>&lt;/b&gt; இல் சேமிக்கவா?"</string>
-    <!-- no translation found for autofill_update_title (4879673117448810818) -->
-    <skip />
-    <!-- no translation found for autofill_update_title_with_type (339733442087186755) -->
-    <skip />
-    <!-- no translation found for autofill_update_title_with_2types (6321714204167424745) -->
-    <skip />
-    <!-- no translation found for autofill_update_title_with_3types (5866735124066629287) -->
-    <skip />
+    <string name="autofill_update_title" msgid="4879673117448810818">"&lt;b&gt;<xliff:g id="LABEL">%1$s</xliff:g>&lt;/b&gt; என்பதற்குப் புதுப்பிக்கவா?"</string>
+    <string name="autofill_update_title_with_type" msgid="339733442087186755">"<xliff:g id="TYPE">%1$s</xliff:g>ஐ &lt;b&gt;<xliff:g id="LABEL">%2$s</xliff:g>&lt;/b&gt; என்பதற்குப் புதுப்பிக்கவா?"</string>
+    <string name="autofill_update_title_with_2types" msgid="6321714204167424745">"<xliff:g id="TYPE_0">%1$s</xliff:g> மற்றும் <xliff:g id="TYPE_1">%2$s</xliff:g>ஐ &lt;b&gt;<xliff:g id="LABEL">%3$s</xliff:g>&lt;/b&gt; என்பதற்குப் புதுப்பிக்கவா?"</string>
+    <string name="autofill_update_title_with_3types" msgid="5866735124066629287">"<xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g> மற்றும் <xliff:g id="TYPE_2">%3$s</xliff:g>ஐ &lt;b&gt;<xliff:g id="LABEL">%4$s</xliff:g>&lt;/b&gt; என்பதற்குப் புதுப்பிக்கவா?"</string>
     <string name="autofill_save_yes" msgid="6398026094049005921">"சேமி"</string>
     <string name="autofill_save_no" msgid="2625132258725581787">"வேண்டாம்"</string>
-    <!-- no translation found for autofill_update_yes (310358413273276958) -->
-    <skip />
+    <string name="autofill_update_yes" msgid="310358413273276958">"புதுப்பி"</string>
     <string name="autofill_save_type_password" msgid="5288448918465971568">"கடவுச்சொல்"</string>
     <string name="autofill_save_type_address" msgid="4936707762193009542">"முகவரி"</string>
     <string name="autofill_save_type_credit_card" msgid="7127694776265563071">"கிரெடிட் கார்டு"</string>
diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml
index 6cef47d..5093aa8 100644
--- a/core/res/res/values-watch/styles_material.xml
+++ b/core/res/res/values-watch/styles_material.xml
@@ -64,10 +64,6 @@
     <style name="TextAppearance.Material.ListItem" parent="TextAppearance.Material.Body1" />
     <style name="TextAppearance.Material.ListItemSecondary" parent="TextAppearance.Material.Caption" />
 
-    <style name="Widget.Material.TextView" parent="Widget.TextView">
-        <item name="breakStrategy">balanced</item>
-    </style>
-
     <style name="TextAppearance.Material.NumberPicker" parent="TextAppearance.Material.Body1">
         <item name="textSize">@dimen/text_size_medium_material</item>
     </style>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 2f710bf..64a9e6d 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -759,6 +759,8 @@
         <attr name="contextPopupMenuStyle" format="reference" />
         <!-- Default StackView style. -->
         <attr name="stackViewStyle" format="reference" />
+        <!-- Magnifier style. -->
+        <attr name="magnifierStyle" format="reference" />
 
         <!-- Default style for the FragmentBreadCrumbs widget. This widget is deprecated
              starting in API level 21 ({@link android.os.Build.VERSION_CODES#.L}). -->
@@ -8921,4 +8923,13 @@
     </declare-styleable>
 
     <attr name="lockPatternStyle" format="reference" />
+
+    <declare-styleable name="Magnifier">
+        <attr name="magnifierWidth" format="dimension" />
+        <attr name="magnifierHeight" format="dimension" />
+        <attr name="magnifierZoom" format="float" />
+        <attr name="magnifierElevation" format="dimension" />
+        <attr name="magnifierVerticalOffset" format="dimension" />
+        <attr name="magnifierHorizontalOffset" format="dimension" />
+    </declare-styleable>
 </resources>
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 74663c9..3c0e51e 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -1388,6 +1388,8 @@
          instantiates items without it.-->
     <attr name="appComponentFactory" format="string" />
 
+    <attr name="usesNonSdkApi" format="boolean" />
+
     <!-- The <code>manifest</code> tag is the root of an
          <code>AndroidManifest.xml</code> file,
          describing the contents of an Android package (.apk) file.  One
@@ -1561,6 +1563,9 @@
 
         <attr name="appComponentFactory" />
 
+        <!-- Declares that this application should be invoked without non-SDK API enforcement -->
+        <attr name="usesNonSdkApi" />
+
     </declare-styleable>
     <!-- The <code>permission</code> tag declares a security permission that can be
          used to control access from other packages to specific components or
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 289c898..c8ad31f 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1282,6 +1282,10 @@
          that can be set by the user. -->
     <integer name="config_screenBrightnessDoze">1</integer>
 
+    <!-- Delay that allows some content to arrive at the display before switching
+         from DOZE to ON. -->
+    <integer name="config_wakeUpDelayDoze">0</integer>
+
     <!-- Whether or not to skip the initial brightness ramps when the display transitions to
          STATE_ON. Setting this to true will skip the brightness ramp to the last stored active
          brightness value and will repeat for the following ramp if autobrightness is enabled. -->
@@ -3363,22 +3367,22 @@
     <bool name="config_sendPackageName">false</bool>
 
     <!-- Name for the set of keys associating package names -->
-    <string name="config_helpPackageNameKey" translatable="false"></string>
+    <string name="config_help_package_name_key" translatable="false"></string>
 
     <!-- Name for the set of values of package names -->
-    <string name="config_helpPackageNameValue" translatable="false"></string>
+    <string name="config_help_package_name_value" translatable="false"></string>
 
     <!-- Intent key for the package name keys -->
-    <string name="config_helpIntentExtraKey" translatable="false"></string>
+    <string name="config_help_intent_extra_key" translatable="false"></string>
 
     <!-- Intent key for package name values -->
-    <string name="config_helpIntentNameKey" translatable="false"></string>
+    <string name="config_help_intent_name_key" translatable="false"></string>
 
     <!-- Intent key for the package name keys -->
-    <string name="config_feedbackIntentExtraKey" translatable="false"></string>
+    <string name="config_feedback_intent_extra_key" translatable="false"></string>
 
     <!-- Intent key for package name values -->
-    <string name="config_feedbackIntentNameKey" translatable="false"></string>
+    <string name="config_feedback_intent_name_key" translatable="false"></string>
 
     <!-- The apps that need to be hidden when they are disabled -->
     <string-array name="config_hideWhenDisabled_packageNames"></string-array>
@@ -3498,6 +3502,9 @@
          empty string is passed in -->
     <string name="config_wlan_network_service_package" translatable="false"></string>
 
+    <!-- Telephony qualified networks service package name to bind to by default. -->
+    <string name="config_qualified_networks_service_package" translatable="false"></string>
+
     <!-- Wear devices: Controls the radios affected by Activity Mode. -->
     <string-array name="config_wearActivityModeRadios">
         <item>"wifi"</item>
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 73cb59e..097ce44 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -564,8 +564,9 @@
     <dimen name="magnifier_width">100dp</dimen>
     <dimen name="magnifier_height">48dp</dimen>
     <dimen name="magnifier_elevation">4dp</dimen>
-    <dimen name="magnifier_offset">42dp</dimen>
-    <item type="dimen" format="float" name="magnifier_zoom_scale">1.25</item>
+    <dimen name="magnifier_vertical_offset">-42dp</dimen>
+    <dimen name="magnifier_horizontal_offset">0dp</dimen>
+    <item type="dimen" format="float" name="magnifier_zoom">1.25</item>
 
     <dimen name="chooser_grid_padding">0dp</dimen>
     <!-- Spacing around the background change frome service to non-service -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index e25bb79..fa31dce 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2911,6 +2911,11 @@
         <public name="supportsAmbientMode" />
     </public-group>
 
+    <public-group type="attr" first-id="0x0101058d">
+        <!-- @hide For use by platform and tools only. Developers should not specify this value. -->
+        <public name="usesNonSdkApi" />
+    </public-group>
+
     <public-group type="style" first-id="0x010302e2">
     </public-group>
 
@@ -2918,6 +2923,23 @@
     </public-group>
 
     <public-group type="string" first-id="0x0104001b">
+        <!-- @hide @SystemApi -->
+        <public name="config_help_package_name_key" />
+        <!-- @hide @SystemApi -->
+        <public name="config_help_package_name_value" />
+        <!-- @hide @SystemApi -->
+        <public name="config_help_intent_extra_key" />
+        <!-- @hide @SystemApi -->
+        <public name="config_help_intent_name_key" />
+        <!-- @hide @SystemApi -->
+        <public name="config_feedback_intent_extra_key" />
+        <!-- @hide @SystemApi -->
+        <public name="config_feedback_intent_name_key" />
+    </public-group>
+
+    <public-group type="bool" first-id="0x01110000">
+        <!-- @hide @SystemApi -->
+        <public name="config_sendPackageName" />
     </public-group>
 
   <!-- ===============================================================
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index dfd5e81..d733207 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1397,6 +1397,9 @@
     <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
     <string name="permdesc_mediaLocation">Allows the app to read locations from your media collection.</string>
 
+    <!-- Message shown when biometric hardware is not available [CHAR LIMIT=50] -->
+    <string name="biometric_error_hw_unavailable">Biometric hardware unavailable</string>
+
     <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
     <string name="fingerprint_acquired_partial">Partial fingerprint detected. Please try again.</string>
     <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
@@ -1411,8 +1414,8 @@
     <string-array name="fingerprint_acquired_vendor">
     </string-array>
 
-    <!-- Message shown by the fingerprint dialog when fingerprint is not recognized -->
-    <string name="fingerprint_not_recognized">Not recognized</string>
+    <!-- Message shown by the biometric dialog when biometric is not recognized -->
+    <string name="biometric_not_recognized">Not recognized</string>
     <!-- Accessibility message announced when a fingerprint has been authenticated [CHAR LIMIT=NONE] -->
     <string name="fingerprint_authenticated">Fingerprint authenticated</string>
 
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index e1db71f..fafcf93 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -799,6 +799,15 @@
         <item name="textOff">@string/capital_off</item>
     </style>
 
+    <style name="Widget.Magnifier">
+        <item name="magnifierWidth">@dimen/magnifier_width</item>
+        <item name="magnifierHeight">@dimen/magnifier_height</item>
+        <item name="magnifierZoom">@dimen/magnifier_zoom</item>
+        <item name="magnifierElevation">@dimen/magnifier_elevation</item>
+        <item name="magnifierVerticalOffset">@dimen/magnifier_vertical_offset</item>
+        <item name="magnifierHorizontalOffset">@dimen/magnifier_horizontal_offset</item>
+    </style>
+
     <!-- Text Appearances -->
     <eat-comment />
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 5358830..e209985 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -273,6 +273,7 @@
   <java-symbol type="string" name="config_wlan_network_service_package" />
   <java-symbol type="string" name="config_wwan_data_service_package" />
   <java-symbol type="string" name="config_wlan_data_service_package" />
+  <java-symbol type="string" name="config_qualified_networks_service_package" />
   <java-symbol type="bool" name="config_networkSamplingWakesDevice" />
   <java-symbol type="bool" name="config_showMenuShortcutsWhenKeyboardPresent" />
   <java-symbol type="bool" name="config_sip_wifi_only" />
@@ -2391,6 +2392,10 @@
   <!-- From KeyguardServiceDelegate -->
   <java-symbol type="string" name="config_keyguardComponent" />
 
+  <!-- Biometric messages -->
+  <java-symbol type="string" name="biometric_error_hw_unavailable" />
+  <java-symbol type="string" name="biometric_not_recognized" />
+
   <!-- Fingerprint messages -->
   <java-symbol type="string" name="fingerprint_error_unable_to_process" />
   <java-symbol type="string" name="fingerprint_error_hw_not_available" />
@@ -2408,7 +2413,6 @@
   <java-symbol type="string" name="fingerprint_error_lockout" />
   <java-symbol type="string" name="fingerprint_error_lockout_permanent" />
   <java-symbol type="string" name="fingerprint_name_template" />
-  <java-symbol type="string" name="fingerprint_not_recognized" />
   <java-symbol type="string" name="fingerprint_authenticated" />
   <java-symbol type="string" name="fingerprint_error_no_fingerprints" />
   <java-symbol type="string" name="fingerprint_error_hw_not_present" />
@@ -2625,8 +2629,16 @@
   <java-symbol type="dimen" name="magnifier_width" />
   <java-symbol type="dimen" name="magnifier_height" />
   <java-symbol type="dimen" name="magnifier_elevation" />
-  <java-symbol type="dimen" name="magnifier_zoom_scale" />
-  <java-symbol type="dimen" name="magnifier_offset" />
+  <java-symbol type="dimen" name="magnifier_zoom" />
+  <java-symbol type="dimen" name="magnifier_vertical_offset" />
+  <java-symbol type="dimen" name="magnifier_horizontal_offset" />
+  <java-symbol type="attr" name="magnifierWidth" />
+  <java-symbol type="attr" name="magnifierHeight" />
+  <java-symbol type="attr" name="magnifierElevation" />
+  <java-symbol type="attr" name="magnifierZoom" />
+  <java-symbol type="attr" name="magnifierVerticalOffset" />
+  <java-symbol type="attr" name="magnifierHorizontalOffset" />
+  <java-symbol type="attr" name="magnifierStyle" />
 
   <java-symbol type="string" name="date_picker_prev_month_button" />
   <java-symbol type="string" name="date_picker_next_month_button" />
@@ -3252,12 +3264,12 @@
   <java-symbol type="integer" name="default_data_warning_level_mb" />
   <java-symbol type="bool" name="config_useVideoPauseWorkaround" />
   <java-symbol type="bool" name="config_sendPackageName" />
-  <java-symbol type="string" name="config_helpPackageNameKey" />
-  <java-symbol type="string" name="config_helpPackageNameValue" />
-  <java-symbol type="string" name="config_helpIntentExtraKey" />
-  <java-symbol type="string" name="config_helpIntentNameKey" />
-  <java-symbol type="string" name="config_feedbackIntentExtraKey" />
-  <java-symbol type="string" name="config_feedbackIntentNameKey" />
+  <java-symbol type="string" name="config_help_package_name_key" />
+  <java-symbol type="string" name="config_help_package_name_value" />
+  <java-symbol type="string" name="config_help_intent_extra_key" />
+  <java-symbol type="string" name="config_help_intent_name_key" />
+  <java-symbol type="string" name="config_feedback_intent_extra_key" />
+  <java-symbol type="string" name="config_feedback_intent_name_key" />
 
   <java-symbol type="array" name="config_hideWhenDisabled_packageNames" />
 
@@ -3451,4 +3463,5 @@
   <java-symbol type="string" name="config_misprovisionedBrandValue" />
 
   <java-symbol type="integer" name="db_wal_truncate_size" />
+  <java-symbol type="integer" name="config_wakeUpDelayDoze" />
 </resources>
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 090f9af..3937af5 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -310,6 +310,7 @@
         <item name="activityChooserViewStyle">@style/Widget.ActivityChooserView</item>
         <item name="fragmentBreadCrumbsStyle">@style/Widget.FragmentBreadCrumbs</item>
         <item name="contextPopupMenuStyle">?attr/popupMenuStyle</item>
+        <item name="magnifierStyle">@style/Widget.Magnifier</item>
 
         <!-- Preference styles -->
         <item name="preferenceScreenStyle">@style/Preference.PreferenceScreen</item>
diff --git a/core/tests/coretests/src/android/os/storage/StorageManagerBaseTest.java b/core/tests/coretests/src/android/os/storage/StorageManagerBaseTest.java
index 56629d4..16dcff5 100644
--- a/core/tests/coretests/src/android/os/storage/StorageManagerBaseTest.java
+++ b/core/tests/coretests/src/android/os/storage/StorageManagerBaseTest.java
@@ -65,95 +65,6 @@
         + "to ourselves and our posterity, do ordain and establish this Constitution\n"
         + "for the United States of America.\n\n";
 
-    class MountingObbThread extends Thread {
-        boolean mStop = false;
-        volatile boolean mFileOpenOnObb = false;
-        private String mObbFilePath = null;
-        private String mPathToContentsFile = null;
-        private String mOfficialObbFilePath = null;
-
-        /**
-         * Constructor
-         *
-         * @param obbFilePath path to the OBB image file
-         * @param pathToContentsFile path to a file on the mounted OBB volume to open after the OBB
-         *      has been mounted
-         */
-        public MountingObbThread (String obbFilePath, String pathToContentsFile) {
-            assertTrue("obbFilePath cannot be null!", obbFilePath != null);
-            mObbFilePath = obbFilePath;
-            assertTrue("path to contents file cannot be null!", pathToContentsFile != null);
-            mPathToContentsFile = pathToContentsFile;
-        }
-
-        /**
-         * Runs the thread
-         *
-         * Mounts OBB_FILE_1, and tries to open a file on the mounted OBB (specified in the
-         * constructor). Once it's open, it waits until someone calls its doStop(), after which it
-         * closes the opened file.
-         */
-        public void run() {
-            // the official OBB file path and the mount-request file path should be the same, but
-            // let's distinguish the two as they may make for some interesting tests later
-            mOfficialObbFilePath = mountObb(mObbFilePath);
-            assertEquals("Expected and actual OBB file paths differ!", mObbFilePath,
-                    mOfficialObbFilePath);
-
-            // open a file on OBB 1...
-            DataInputStream inputFile = openFileOnMountedObb(mOfficialObbFilePath,
-                    mPathToContentsFile);
-            assertTrue("Failed to open file!", inputFile != null);
-
-            synchronized (this) {
-                mFileOpenOnObb = true;
-                notifyAll();
-            }
-
-            while (!mStop) {
-                try {
-                    Thread.sleep(WAIT_TIME_INCR);
-                } catch (InterruptedException e) {
-                    // nothing special to be done for interruptions
-                }
-            }
-            try {
-                inputFile.close();
-            } catch (IOException e) {
-                fail("Failed to close file on OBB due to error: " + e.toString());
-            }
-        }
-
-        /**
-         * Tells whether a file has yet been successfully opened on the OBB or not
-         *
-         * @return true if the specified file on the OBB was opened; false otherwise
-         */
-        public boolean isFileOpenOnObb() {
-            return mFileOpenOnObb;
-        }
-
-        /**
-         * Returns the official path of the OBB file that was mounted
-         *
-         * This is not the mount path, but the normalized path to the actual OBB file
-         *
-         * @return a {@link String} representation of the path to the OBB file that was mounted
-         */
-        public String officialObbFilePath() {
-            return mOfficialObbFilePath;
-        }
-
-        /**
-         * Requests the thread to stop running
-         *
-         * Closes the opened file and returns
-         */
-        public void doStop() {
-            mStop = true;
-        }
-    }
-
     public class ObbListener extends OnObbStateChangeListener {
         private String LOG_TAG = "StorageManagerBaseTest.ObbListener";
 
@@ -362,7 +273,8 @@
         assertTrue("mountObb call failed", mSm.mountObb(obbFilePath, key, obbListener));
         assertTrue("Failed to get OBB mount status change for file: " + obbFilePath,
                 doWaitForObbStateChange(obbListener));
-        assertEquals("OBB mount state not what was expected!", expectedState, obbListener.state());
+        assertEquals("OBB mount state not what was expected!", expectedState,
+                obbListener.state());
 
         if (OnObbStateChangeListener.MOUNTED == expectedState) {
             assertEquals(obbFilePath, obbListener.officialPath());
@@ -373,7 +285,8 @@
                     mSm.isObbMounted(obbListener.officialPath()));
         }
 
-        assertEquals("Mount state is not what was expected!", expectedState, obbListener.state());
+        assertEquals("Mount state is not what was expected!", expectedState,
+                obbListener.state());
         return obbListener.officialPath();
     }
 
diff --git a/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java b/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java
index 5f8bd03..3ec297c 100644
--- a/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java
+++ b/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java
@@ -20,7 +20,6 @@
 import android.os.ProxyFileDescriptorCallback;
 import android.system.ErrnoException;
 import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
 
 import com.android.frameworks.coretests.R;
 
@@ -135,57 +134,18 @@
     }
 
     /**
-     * Tests that we can not force unmount when a file is currently open on the OBB.
-     */
-    @LargeTest
-    public void testUnmount_DontForce() throws Exception {
-        final File file = createObbFile(OBB_FILE_1, R.raw.obb_file1);
-        String obbFilePath = file.getAbsolutePath();
-
-        MountingObbThread mountingThread = new MountingObbThread(obbFilePath,
-                OBB_FILE_1_CONTENTS_1);
-
-        try {
-            mountingThread.start();
-
-            long waitTime = 0;
-            while (!mountingThread.isFileOpenOnObb()) {
-                synchronized (mountingThread) {
-                    Log.i(LOG_TAG, "Waiting for file to be opened on OBB...");
-                    mountingThread.wait(WAIT_TIME_INCR);
-                    waitTime += WAIT_TIME_INCR;
-                    if (waitTime > MAX_WAIT_TIME) {
-                        fail("Timed out waiting for file file to be opened on OBB!");
-                    }
-                }
-            }
-
-            unmountObb(obbFilePath, DONT_FORCE);
-
-            // verify still mounted
-            assertTrue("mounted path should not be null!", obbFilePath != null);
-            assertTrue("mounted path should still be mounted!", mSm.isObbMounted(obbFilePath));
-
-            // close the opened file
-            mountingThread.doStop();
-
-            // try unmounting again (should succeed this time)
-            unmountObb(obbFilePath, DONT_FORCE);
-            assertFalse("mounted path should no longer be mounted!",
-                    mSm.isObbMounted(obbFilePath));
-        } catch (InterruptedException e) {
-            fail("Timed out waiting for file on OBB to be opened...");
-        }
-    }
-
-    /**
      * Tests mounting a single OBB that isn't signed.
      */
     @LargeTest
     public void testMountUnsignedObb() throws Exception {
         final File file = createObbFile(OBB_FILE_2_UNSIGNED, R.raw.obb_file2_nosign);
         String filePath = file.getAbsolutePath();
-        mountObb(filePath, OBB_FILE_2_UNSIGNED, OnObbStateChangeListener.ERROR_INTERNAL);
+        try {
+            mountObb(filePath, OBB_FILE_2_UNSIGNED, OnObbStateChangeListener.ERROR_INTERNAL);
+            fail("mountObb should've failed with an exception");
+        } catch (IllegalArgumentException e) {
+            // Expected
+        }
     }
 
     /**
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 71627ab..189a4aa 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -422,6 +422,7 @@
                     Settings.Global.TETHER_DUN_REQUIRED,
                     Settings.Global.TETHER_OFFLOAD_DISABLED,
                     Settings.Global.TETHER_SUPPORTED,
+                    Settings.Global.TETHER_ENABLE_LEGACY_DHCP_SERVER,
                     Settings.Global.TEXT_CLASSIFIER_CONSTANTS,
                     Settings.Global.THEATER_MODE_ON,
                     Settings.Global.TIME_ONLY_MODE_CONSTANTS,
diff --git a/data/etc/OWNERS b/data/etc/OWNERS
index f7a3e1a..bbec474 100644
--- a/data/etc/OWNERS
+++ b/data/etc/OWNERS
@@ -1,7 +1 @@
-per-file privapp-permissions-platform.xml = bpoiesz@google.com
-per-file privapp-permissions-platform.xml = fkupolov@google.com
-per-file privapp-permissions-platform.xml = hackbod@android.com
-per-file privapp-permissions-platform.xml = jsharkey@android.com
-per-file privapp-permissions-platform.xml = svetoslavganov@google.com
-per-file privapp-permissions-platform.xml = toddke@google.com
-per-file privapp-permissions-platform.xml = yamasani@google.com
+per-file privapp-permissions-platform.xml = hackbod@android.com, jsharkey@android.com, svetoslavganov@google.com, toddke@google.com, yamasani@google.com
diff --git a/data/keyboards/Vendor_18d1_Product_2c40.kl b/data/keyboards/Vendor_18d1_Product_2c40.kl
index 6efde4f..2b42f87 100644
--- a/data/keyboards/Vendor_18d1_Product_2c40.kl
+++ b/data/keyboards/Vendor_18d1_Product_2c40.kl
@@ -20,13 +20,9 @@
 key 308 BUTTON_Y
 key 310 BUTTON_L1
 key 311 BUTTON_R1
-key 316 BUTTON_MODE
 key 317 BUTTON_THUMBL
 key 318 BUTTON_THUMBR
 
-key 158 BACK
-key 172 HOME
-
 axis 0x00 X
 axis 0x01 Y
 axis 0x02 Z
@@ -40,3 +36,14 @@
 led 0x01 CONTROLLER_2
 led 0x02 CONTROLLER_3
 led 0x03 CONTROLLER_4
+
+# The next 2 buttons do not follow Linux standard because this behaviour was specified by the UX
+# Left arrow to the immediate left of the power button
+key 158 BACK
+# Circle to the immediate right of the power button
+key 172 HOME
+
+
+# Mapping according to https://www.kernel.org/doc/Documentation/input/gamepad.txt
+# Power button
+key 316 BUTTON_MODE
diff --git a/graphics/java/android/graphics/Movie.java b/graphics/java/android/graphics/Movie.java
index 4c953b5..8162544 100644
--- a/graphics/java/android/graphics/Movie.java
+++ b/graphics/java/android/graphics/Movie.java
@@ -25,6 +25,7 @@
 /**
  * @deprecated Prefer {@link android.graphics.drawable.AnimatedImageDrawable}.
  */
+@Deprecated
 public class Movie {
     @UnsupportedAppUsage
     private long mNativeMovie;
diff --git a/graphics/java/android/graphics/drawable/ColorStateListDrawable.java b/graphics/java/android/graphics/drawable/ColorStateListDrawable.java
index 40ba5d1..c0c6a4f 100644
--- a/graphics/java/android/graphics/drawable/ColorStateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/ColorStateListDrawable.java
@@ -33,6 +33,7 @@
 public class ColorStateListDrawable extends Drawable implements Drawable.Callback {
     private ColorDrawable mColorDrawable;
     private ColorStateListDrawableState mState;
+    private boolean mMutated = false;
 
     public ColorStateListDrawable() {
         mState = new ColorStateListDrawableState();
@@ -139,7 +140,7 @@
             int color = mState.mColor.getColorForState(state, mState.mColor.getDefaultColor());
 
             if (mState.mAlpha != -1) {
-                color = color & 0xFFFFFF | MathUtils.constrain(mState.mAlpha, 0, 255) << 24;
+                color = (color & 0xFFFFFF) | MathUtils.constrain(mState.mAlpha, 0, 255) << 24;
             }
 
             if (color != mColorDrawable.getColor()) {
@@ -183,6 +184,8 @@
 
     @Override
     public ConstantState getConstantState() {
+        mState.mChangingConfigurations = mState.mChangingConfigurations
+                | (getChangingConfigurations() & ~mState.getChangingConfigurations());
         return mState;
     }
 
@@ -200,6 +203,29 @@
         }
     }
 
+    @Override
+    public int getChangingConfigurations() {
+        return super.getChangingConfigurations() | mState.getChangingConfigurations();
+    }
+
+    @Override
+    public Drawable mutate() {
+        if (!mMutated && super.mutate() == this) {
+            mState = new ColorStateListDrawableState(mState);
+            mMutated = true;
+        }
+        return this;
+    }
+
+    /**
+     * @hide
+     */
+    @Override
+    public void clearMutated() {
+        super.clearMutated();
+        mMutated = false;
+    }
+
     /**
      * Replace this Drawable's ColorStateList. It is not copied, so changes will propagate on the
      * next call to {@link #setState(int[])}.
@@ -221,6 +247,13 @@
         ColorStateListDrawableState() {
         }
 
+        ColorStateListDrawableState(ColorStateListDrawableState state) {
+            mColor = state.mColor;
+            mTint = state.mTint;
+            mAlpha = state.mAlpha;
+            mTintMode = state.mTintMode;
+            mChangingConfigurations = state.mChangingConfigurations;
+        }
 
         @Override
         public Drawable newDrawable() {
diff --git a/keystore/java/android/security/keystore/AttestationUtils.java b/keystore/java/android/security/keystore/AttestationUtils.java
index 3d2a271..bd497c1 100644
--- a/keystore/java/android/security/keystore/AttestationUtils.java
+++ b/keystore/java/android/security/keystore/AttestationUtils.java
@@ -29,6 +29,7 @@
 import android.security.keymaster.KeymasterCertificateChain;
 import android.security.keymaster.KeymasterDefs;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
 import android.util.ArraySet;
 
 import java.io.ByteArrayInputStream;
@@ -128,14 +129,14 @@
     @NonNull public static KeymasterArguments prepareAttestationArgumentsIfMisprovisioned(
             Context context, @NonNull int[] idTypes, @NonNull byte[] attestationChallenge) throws
             DeviceIdAttestationException {
-        if (!isPotentiallyMisprovisionedDevice(context)) {
-            return null;
-        }
         Resources resources = context.getResources();
         String misprovisionedBrand = resources.getString(
                 com.android.internal.R.string.config_misprovisionedBrandValue);
+        if (!TextUtils.isEmpty(misprovisionedBrand) && !isPotentiallyMisprovisionedDevice(context)){
+            return null;
+        }
         return prepareAttestationArguments(
-                    context, idTypes, attestationChallenge, misprovisionedBrand);
+                context, idTypes, attestationChallenge, misprovisionedBrand);
     }
 
     @NonNull private static boolean isPotentiallyMisprovisionedDevice(Context context) {
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 83e90b6..edce305 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -72,6 +72,7 @@
         "libft2",
         "libminikin",
         "libandroidfw",
+        "libcrypto",
     ],
     static_libs: [
         "libEGL_blobCache",
@@ -225,6 +226,7 @@
         "Properties.cpp",
         "PropertyValuesAnimatorSet.cpp",
         "PropertyValuesHolder.cpp",
+        "RecordingCanvas.cpp",
         "RenderNode.cpp",
         "RenderProperties.cpp",
         "ResourceCache.cpp",
diff --git a/libs/hwui/CanvasTransform.cpp b/libs/hwui/CanvasTransform.cpp
index 1b15dbd..adcdc18 100644
--- a/libs/hwui/CanvasTransform.cpp
+++ b/libs/hwui/CanvasTransform.cpp
@@ -15,16 +15,20 @@
  */
 
 #include "CanvasTransform.h"
-#include "utils/Color.h"
 #include "Properties.h"
+#include "utils/Color.h"
 
-#include <ui/ColorSpace.h>
 #include <SkColorFilter.h>
+#include <SkGradientShader.h>
 #include <SkPaint.h>
+#include <SkShader.h>
+#include <ui/ColorSpace.h>
 
 #include <algorithm>
 #include <cmath>
 
+#include <log/log.h>
+
 namespace android::uirenderer {
 
 static SkColor makeLight(SkColor color) {
@@ -66,6 +70,32 @@
     SkColor newColor = transformColor(transform, paint.getColor());
     paint.setColor(newColor);
 
+    if (paint.getShader()) {
+        SkShader::GradientInfo info;
+        std::array<SkColor, 10> _colorStorage;
+        std::array<SkScalar, _colorStorage.size()> _offsetStorage;
+        info.fColorCount = _colorStorage.size();
+        info.fColors = _colorStorage.data();
+        info.fColorOffsets = _offsetStorage.data();
+        SkShader::GradientType type = paint.getShader()->asAGradient(&info);
+        ALOGW_IF(type, "Found gradient of type = %d", type);
+
+        if (info.fColorCount <= 10) {
+            switch (type) {
+                case SkShader::kLinear_GradientType:
+                    for (int i = 0; i < info.fColorCount; i++) {
+                        info.fColors[i] = transformColor(transform, info.fColors[i]);
+                    }
+                    paint.setShader(SkGradientShader::MakeLinear(info.fPoint, info.fColors,
+                                                                 info.fColorOffsets, info.fColorCount,
+                                                                 info.fTileMode, info.fGradientFlags, nullptr));
+                    break;
+                default:break;
+            }
+
+        }
+    }
+
     if (paint.getColorFilter()) {
         SkBlendMode mode;
         SkColor color;
@@ -77,43 +107,10 @@
     }
 }
 
-class ColorFilterCanvas : public SkPaintFilterCanvas {
-public:
-    ColorFilterCanvas(ColorTransform transform, SkCanvas* canvas)
-            : SkPaintFilterCanvas(canvas), mTransform(transform) {}
-
-    bool onFilter(SkTCopyOnFirstWrite<SkPaint>* paint, Type type) const override {
-        if (*paint) {
-            applyColorTransform(mTransform, *(paint->writable()));
-        }
-        return true;
-    }
-
-private:
-    ColorTransform mTransform;
-};
-
-std::unique_ptr<SkCanvas> makeTransformCanvas(SkCanvas* inCanvas, ColorTransform transform) {
-    switch (transform) {
-        case ColorTransform::Light:
-            return std::make_unique<ColorFilterCanvas>(ColorTransform::Light, inCanvas);
-        case ColorTransform::Dark:
-            return std::make_unique<ColorFilterCanvas>(ColorTransform::Dark, inCanvas);
-        default:
-            return nullptr;
-    }
-}
-
-std::unique_ptr<SkCanvas> makeTransformCanvas(SkCanvas* inCanvas, UsageHint usageHint) {
-    if (Properties::forceDarkMode) {
-        switch (usageHint) {
-            case UsageHint::Unknown:
-                return makeTransformCanvas(inCanvas, ColorTransform::Light);
-            case UsageHint::Background:
-                return makeTransformCanvas(inCanvas, ColorTransform::Dark);
-        }
-    }
-    return nullptr;
+bool transformPaint(ColorTransform transform, SkPaint* paint) {
+    // TODO
+    applyColorTransform(transform, *paint);
+    return true;
 }
 
 };  // namespace android::uirenderer
\ No newline at end of file
diff --git a/libs/hwui/CanvasTransform.h b/libs/hwui/CanvasTransform.h
index f71fdfa..32d9a05 100644
--- a/libs/hwui/CanvasTransform.h
+++ b/libs/hwui/CanvasTransform.h
@@ -34,7 +34,7 @@
     Dark,
 };
 
-std::unique_ptr<SkCanvas> makeTransformCanvas(SkCanvas* inCanvas, ColorTransform transform);
-std::unique_ptr<SkCanvas> makeTransformCanvas(SkCanvas* inCanvas, UsageHint usageHint);
+// True if the paint was modified, false otherwise
+bool transformPaint(ColorTransform transform, SkPaint* paint);
 
 }  // namespace android::uirenderer;
\ No newline at end of file
diff --git a/libs/hwui/DeviceInfo.cpp b/libs/hwui/DeviceInfo.cpp
index 10fcee8..a43f58c 100644
--- a/libs/hwui/DeviceInfo.cpp
+++ b/libs/hwui/DeviceInfo.cpp
@@ -42,6 +42,8 @@
         false,  // secure?
         0,      // appVsyncOffset
         0,      // presentationDeadline
+        1080,   // viewportW
+        1920,   // viewportH
 };
 
 static DeviceInfo* sDeviceInfo = nullptr;
diff --git a/libs/hwui/DisplayListOps.in b/libs/hwui/DisplayListOps.in
new file mode 100644
index 0000000..f61c156
--- /dev/null
+++ b/libs/hwui/DisplayListOps.in
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+X(Flush) 
+X(Save) 
+X(Restore) 
+X(SaveLayer)
+X(Concat) 
+X(SetMatrix) 
+X(Translate)
+X(ClipPath) 
+X(ClipRect) 
+X(ClipRRect) 
+X(ClipRegion)
+X(DrawPaint) 
+X(DrawPath) 
+X(DrawRect) 
+X(DrawRegion) 
+X(DrawOval) 
+X(DrawArc)
+X(DrawRRect) 
+X(DrawDRRect) 
+X(DrawAnnotation) 
+X(DrawDrawable) 
+X(DrawPicture)
+X(DrawImage) 
+X(DrawImageNine) 
+X(DrawImageRect) 
+X(DrawImageLattice)
+X(DrawText) 
+X(DrawPosText) 
+X(DrawPosTextH)
+X(DrawTextRSXform) 
+X(DrawTextBlob)
+X(DrawPatch) 
+X(DrawPoints) 
+X(DrawVertices) 
+X(DrawAtlas) 
+X(DrawShadowRec)
\ No newline at end of file
diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp
new file mode 100644
index 0000000..3eaff03
--- /dev/null
+++ b/libs/hwui/RecordingCanvas.cpp
@@ -0,0 +1,934 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "RecordingCanvas.h"
+
+#include "SkCanvas.h"
+#include "SkData.h"
+#include "SkDrawShadowInfo.h"
+#include "SkImage.h"
+#include "SkImageFilter.h"
+#include "SkMath.h"
+#include "SkPicture.h"
+#include "SkRSXform.h"
+#include "SkRegion.h"
+#include "SkTextBlob.h"
+#include "SkVertices.h"
+
+#include <experimental/type_traits>
+
+namespace android {
+namespace uirenderer {
+
+#ifndef SKLITEDL_PAGE
+#define SKLITEDL_PAGE 4096
+#endif
+
+// A stand-in for an optional SkRect which was not set, e.g. bounds for a saveLayer().
+static const SkRect kUnset = {SK_ScalarInfinity, 0, 0, 0};
+static const SkRect* maybe_unset(const SkRect& r) {
+    return r.left() == SK_ScalarInfinity ? nullptr : &r;
+}
+
+// copy_v(dst, src,n, src,n, ...) copies an arbitrary number of typed srcs into dst.
+static void copy_v(void* dst) {}
+
+template <typename S, typename... Rest>
+static void copy_v(void* dst, const S* src, int n, Rest&&... rest) {
+    SkASSERTF(((uintptr_t)dst & (alignof(S) - 1)) == 0,
+              "Expected %p to be aligned for at least %zu bytes.", dst, alignof(S));
+    sk_careful_memcpy(dst, src, n * sizeof(S));
+    copy_v(SkTAddOffset<void>(dst, n * sizeof(S)), std::forward<Rest>(rest)...);
+}
+
+// Helper for getting back at arrays which have been copy_v'd together after an Op.
+template <typename D, typename T>
+static const D* pod(const T* op, size_t offset = 0) {
+    return SkTAddOffset<const D>(op + 1, offset);
+}
+
+namespace {
+
+#define X(T) T,
+enum class Type : uint8_t {
+#include "DisplayListOps.in"
+};
+#undef X
+
+struct Op {
+    uint32_t type : 8;
+    uint32_t skip : 24;
+};
+static_assert(sizeof(Op) == 4, "");
+
+struct Flush final : Op {
+    static const auto kType = Type::Flush;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->flush(); }
+};
+
+struct Save final : Op {
+    static const auto kType = Type::Save;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->save(); }
+};
+struct Restore final : Op {
+    static const auto kType = Type::Restore;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->restore(); }
+};
+struct SaveLayer final : Op {
+    static const auto kType = Type::SaveLayer;
+    SaveLayer(const SkRect* bounds, const SkPaint* paint, const SkImageFilter* backdrop,
+              const SkImage* clipMask, const SkMatrix* clipMatrix, SkCanvas::SaveLayerFlags flags) {
+        if (bounds) {
+            this->bounds = *bounds;
+        }
+        if (paint) {
+            this->paint = *paint;
+        }
+        this->backdrop = sk_ref_sp(backdrop);
+        this->clipMask = sk_ref_sp(clipMask);
+        this->clipMatrix = clipMatrix ? *clipMatrix : SkMatrix::I();
+        this->flags = flags;
+    }
+    SkRect bounds = kUnset;
+    SkPaint paint;
+    sk_sp<const SkImageFilter> backdrop;
+    sk_sp<const SkImage> clipMask;
+    SkMatrix clipMatrix;
+    SkCanvas::SaveLayerFlags flags;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->saveLayer({maybe_unset(bounds), &paint, backdrop.get(), clipMask.get(),
+                      clipMatrix.isIdentity() ? nullptr : &clipMatrix, flags});
+    }
+};
+
+struct Concat final : Op {
+    static const auto kType = Type::Concat;
+    Concat(const SkMatrix& matrix) : matrix(matrix) {}
+    SkMatrix matrix;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->concat(matrix); }
+};
+struct SetMatrix final : Op {
+    static const auto kType = Type::SetMatrix;
+    SetMatrix(const SkMatrix& matrix) : matrix(matrix) {}
+    SkMatrix matrix;
+    void draw(SkCanvas* c, const SkMatrix& original) const {
+        c->setMatrix(SkMatrix::Concat(original, matrix));
+    }
+};
+struct Translate final : Op {
+    static const auto kType = Type::Translate;
+    Translate(SkScalar dx, SkScalar dy) : dx(dx), dy(dy) {}
+    SkScalar dx, dy;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->translate(dx, dy); }
+};
+
+struct ClipPath final : Op {
+    static const auto kType = Type::ClipPath;
+    ClipPath(const SkPath& path, SkClipOp op, bool aa) : path(path), op(op), aa(aa) {}
+    SkPath path;
+    SkClipOp op;
+    bool aa;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->clipPath(path, op, aa); }
+};
+struct ClipRect final : Op {
+    static const auto kType = Type::ClipRect;
+    ClipRect(const SkRect& rect, SkClipOp op, bool aa) : rect(rect), op(op), aa(aa) {}
+    SkRect rect;
+    SkClipOp op;
+    bool aa;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->clipRect(rect, op, aa); }
+};
+struct ClipRRect final : Op {
+    static const auto kType = Type::ClipRRect;
+    ClipRRect(const SkRRect& rrect, SkClipOp op, bool aa) : rrect(rrect), op(op), aa(aa) {}
+    SkRRect rrect;
+    SkClipOp op;
+    bool aa;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->clipRRect(rrect, op, aa); }
+};
+struct ClipRegion final : Op {
+    static const auto kType = Type::ClipRegion;
+    ClipRegion(const SkRegion& region, SkClipOp op) : region(region), op(op) {}
+    SkRegion region;
+    SkClipOp op;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->clipRegion(region, op); }
+};
+
+struct DrawPaint final : Op {
+    static const auto kType = Type::DrawPaint;
+    DrawPaint(const SkPaint& paint) : paint(paint) {}
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawPaint(paint); }
+};
+struct DrawPath final : Op {
+    static const auto kType = Type::DrawPath;
+    DrawPath(const SkPath& path, const SkPaint& paint) : path(path), paint(paint) {}
+    SkPath path;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawPath(path, paint); }
+};
+struct DrawRect final : Op {
+    static const auto kType = Type::DrawRect;
+    DrawRect(const SkRect& rect, const SkPaint& paint) : rect(rect), paint(paint) {}
+    SkRect rect;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawRect(rect, paint); }
+};
+struct DrawRegion final : Op {
+    static const auto kType = Type::DrawRegion;
+    DrawRegion(const SkRegion& region, const SkPaint& paint) : region(region), paint(paint) {}
+    SkRegion region;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawRegion(region, paint); }
+};
+struct DrawOval final : Op {
+    static const auto kType = Type::DrawOval;
+    DrawOval(const SkRect& oval, const SkPaint& paint) : oval(oval), paint(paint) {}
+    SkRect oval;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawOval(oval, paint); }
+};
+struct DrawArc final : Op {
+    static const auto kType = Type::DrawArc;
+    DrawArc(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle, bool useCenter,
+            const SkPaint& paint)
+            : oval(oval)
+            , startAngle(startAngle)
+            , sweepAngle(sweepAngle)
+            , useCenter(useCenter)
+            , paint(paint) {}
+    SkRect oval;
+    SkScalar startAngle;
+    SkScalar sweepAngle;
+    bool useCenter;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->drawArc(oval, startAngle, sweepAngle, useCenter, paint);
+    }
+};
+struct DrawRRect final : Op {
+    static const auto kType = Type::DrawRRect;
+    DrawRRect(const SkRRect& rrect, const SkPaint& paint) : rrect(rrect), paint(paint) {}
+    SkRRect rrect;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawRRect(rrect, paint); }
+};
+struct DrawDRRect final : Op {
+    static const auto kType = Type::DrawDRRect;
+    DrawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint& paint)
+            : outer(outer), inner(inner), paint(paint) {}
+    SkRRect outer, inner;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawDRRect(outer, inner, paint); }
+};
+
+struct DrawAnnotation final : Op {
+    static const auto kType = Type::DrawAnnotation;
+    DrawAnnotation(const SkRect& rect, SkData* value) : rect(rect), value(sk_ref_sp(value)) {}
+    SkRect rect;
+    sk_sp<SkData> value;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->drawAnnotation(rect, pod<char>(this), value.get());
+    }
+};
+struct DrawDrawable final : Op {
+    static const auto kType = Type::DrawDrawable;
+    DrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) : drawable(sk_ref_sp(drawable)) {
+        if (matrix) {
+            this->matrix = *matrix;
+        }
+    }
+    sk_sp<SkDrawable> drawable;
+    SkMatrix matrix = SkMatrix::I();
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawDrawable(drawable.get(), &matrix); }
+};
+struct DrawPicture final : Op {
+    static const auto kType = Type::DrawPicture;
+    DrawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint)
+            : picture(sk_ref_sp(picture)) {
+        if (matrix) {
+            this->matrix = *matrix;
+        }
+        if (paint) {
+            this->paint = *paint;
+            has_paint = true;
+        }
+    }
+    sk_sp<const SkPicture> picture;
+    SkMatrix matrix = SkMatrix::I();
+    SkPaint paint;
+    bool has_paint = false;  // TODO: why is a default paint not the same?
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->drawPicture(picture.get(), &matrix, has_paint ? &paint : nullptr);
+    }
+};
+
+struct DrawImage final : Op {
+    static const auto kType = Type::DrawImage;
+    DrawImage(sk_sp<const SkImage>&& image, SkScalar x, SkScalar y, const SkPaint* paint)
+            : image(std::move(image)), x(x), y(y) {
+        if (paint) {
+            this->paint = *paint;
+        }
+    }
+    sk_sp<const SkImage> image;
+    SkScalar x, y;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawImage(image.get(), x, y, &paint); }
+};
+struct DrawImageNine final : Op {
+    static const auto kType = Type::DrawImageNine;
+    DrawImageNine(sk_sp<const SkImage>&& image, const SkIRect& center, const SkRect& dst,
+                  const SkPaint* paint)
+            : image(std::move(image)), center(center), dst(dst) {
+        if (paint) {
+            this->paint = *paint;
+        }
+    }
+    sk_sp<const SkImage> image;
+    SkIRect center;
+    SkRect dst;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->drawImageNine(image.get(), center, dst, &paint);
+    }
+};
+struct DrawImageRect final : Op {
+    static const auto kType = Type::DrawImageRect;
+    DrawImageRect(sk_sp<const SkImage>&& image, const SkRect* src, const SkRect& dst,
+                  const SkPaint* paint, SkCanvas::SrcRectConstraint constraint)
+            : image(std::move(image)), dst(dst), constraint(constraint) {
+        this->src = src ? *src : SkRect::MakeIWH(this->image->width(), this->image->height());
+        if (paint) {
+            this->paint = *paint;
+        }
+    }
+    sk_sp<const SkImage> image;
+    SkRect src, dst;
+    SkPaint paint;
+    SkCanvas::SrcRectConstraint constraint;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->drawImageRect(image.get(), src, dst, &paint, constraint);
+    }
+};
+struct DrawImageLattice final : Op {
+    static const auto kType = Type::DrawImageLattice;
+    DrawImageLattice(sk_sp<const SkImage>&& image, int xs, int ys, int fs, const SkIRect& src,
+                     const SkRect& dst, const SkPaint* paint)
+            : image(std::move(image)), xs(xs), ys(ys), fs(fs), src(src), dst(dst) {
+        if (paint) {
+            this->paint = *paint;
+        }
+    }
+    sk_sp<const SkImage> image;
+    int xs, ys, fs;
+    SkIRect src;
+    SkRect dst;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        auto xdivs = pod<int>(this, 0), ydivs = pod<int>(this, xs * sizeof(int));
+        auto colors = (0 == fs) ? nullptr : pod<SkColor>(this, (xs + ys) * sizeof(int));
+        auto flags =
+                (0 == fs) ? nullptr : pod<SkCanvas::Lattice::RectType>(
+                                              this, (xs + ys) * sizeof(int) + fs * sizeof(SkColor));
+        c->drawImageLattice(image.get(), {xdivs, ydivs, flags, xs, ys, &src, colors}, dst, &paint);
+    }
+};
+
+struct DrawText final : Op {
+    static const auto kType = Type::DrawText;
+    DrawText(size_t bytes, SkScalar x, SkScalar y, const SkPaint& paint)
+            : bytes(bytes), x(x), y(y), paint(paint) {}
+    size_t bytes;
+    SkScalar x, y;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->drawText(pod<void>(this), bytes, x, y, paint);
+    }
+};
+struct DrawPosText final : Op {
+    static const auto kType = Type::DrawPosText;
+    DrawPosText(size_t bytes, const SkPaint& paint, int n) : bytes(bytes), paint(paint), n(n) {}
+    size_t bytes;
+    SkPaint paint;
+    int n;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        auto points = pod<SkPoint>(this);
+        auto text = pod<void>(this, n * sizeof(SkPoint));
+        c->drawPosText(text, bytes, points, paint);
+    }
+};
+struct DrawPosTextH final : Op {
+    static const auto kType = Type::DrawPosTextH;
+    DrawPosTextH(size_t bytes, SkScalar y, const SkPaint& paint, int n)
+            : bytes(bytes), y(y), paint(paint), n(n) {}
+    size_t bytes;
+    SkScalar y;
+    SkPaint paint;
+    int n;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        auto xs = pod<SkScalar>(this);
+        auto text = pod<void>(this, n * sizeof(SkScalar));
+        c->drawPosTextH(text, bytes, xs, y, paint);
+    }
+};
+struct DrawTextRSXform final : Op {
+    static const auto kType = Type::DrawTextRSXform;
+    DrawTextRSXform(size_t bytes, int xforms, const SkRect* cull, const SkPaint& paint)
+            : bytes(bytes), xforms(xforms), paint(paint) {
+        if (cull) {
+            this->cull = *cull;
+        }
+    }
+    size_t bytes;
+    int xforms;
+    SkRect cull = kUnset;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        // For alignment, the SkRSXforms are first in the pod section, followed by the text.
+        c->drawTextRSXform(pod<void>(this, xforms * sizeof(SkRSXform)), bytes, pod<SkRSXform>(this),
+                           maybe_unset(cull), paint);
+    }
+};
+struct DrawTextBlob final : Op {
+    static const auto kType = Type::DrawTextBlob;
+    DrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint)
+            : blob(sk_ref_sp(blob)), x(x), y(y), paint(paint) {}
+    sk_sp<const SkTextBlob> blob;
+    SkScalar x, y;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->drawTextBlob(blob.get(), x, y, paint); }
+};
+
+struct DrawPatch final : Op {
+    static const auto kType = Type::DrawPatch;
+    DrawPatch(const SkPoint cubics[12], const SkColor colors[4], const SkPoint texs[4],
+              SkBlendMode bmode, const SkPaint& paint)
+            : xfermode(bmode), paint(paint) {
+        copy_v(this->cubics, cubics, 12);
+        if (colors) {
+            copy_v(this->colors, colors, 4);
+            has_colors = true;
+        }
+        if (texs) {
+            copy_v(this->texs, texs, 4);
+            has_texs = true;
+        }
+    }
+    SkPoint cubics[12];
+    SkColor colors[4];
+    SkPoint texs[4];
+    SkBlendMode xfermode;
+    SkPaint paint;
+    bool has_colors = false;
+    bool has_texs = false;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->drawPatch(cubics, has_colors ? colors : nullptr, has_texs ? texs : nullptr, xfermode,
+                     paint);
+    }
+};
+struct DrawPoints final : Op {
+    static const auto kType = Type::DrawPoints;
+    DrawPoints(SkCanvas::PointMode mode, size_t count, const SkPaint& paint)
+            : mode(mode), count(count), paint(paint) {}
+    SkCanvas::PointMode mode;
+    size_t count;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->drawPoints(mode, count, pod<SkPoint>(this), paint);
+    }
+};
+struct DrawVertices final : Op {
+    static const auto kType = Type::DrawVertices;
+    DrawVertices(const SkVertices* v, int bc, SkBlendMode m, const SkPaint& p)
+            : vertices(sk_ref_sp(const_cast<SkVertices*>(v))), boneCount(bc), mode(m), paint(p) {}
+    sk_sp<SkVertices> vertices;
+    int boneCount;
+    SkBlendMode mode;
+    SkPaint paint;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        c->drawVertices(vertices, pod<SkVertices::Bone>(this), boneCount, mode, paint);
+    }
+};
+struct DrawAtlas final : Op {
+    static const auto kType = Type::DrawAtlas;
+    DrawAtlas(const SkImage* atlas, int count, SkBlendMode xfermode, const SkRect* cull,
+              const SkPaint* paint, bool has_colors)
+            : atlas(sk_ref_sp(atlas)), count(count), xfermode(xfermode), has_colors(has_colors) {
+        if (cull) {
+            this->cull = *cull;
+        }
+        if (paint) {
+            this->paint = *paint;
+        }
+    }
+    sk_sp<const SkImage> atlas;
+    int count;
+    SkBlendMode xfermode;
+    SkRect cull = kUnset;
+    SkPaint paint;
+    bool has_colors;
+    void draw(SkCanvas* c, const SkMatrix&) const {
+        auto xforms = pod<SkRSXform>(this, 0);
+        auto texs = pod<SkRect>(this, count * sizeof(SkRSXform));
+        auto colors = has_colors ? pod<SkColor>(this, count * (sizeof(SkRSXform) + sizeof(SkRect)))
+                                 : nullptr;
+        c->drawAtlas(atlas.get(), xforms, texs, colors, count, xfermode, maybe_unset(cull), &paint);
+    }
+};
+struct DrawShadowRec final : Op {
+    static const auto kType = Type::DrawShadowRec;
+    DrawShadowRec(const SkPath& path, const SkDrawShadowRec& rec) : fPath(path), fRec(rec) {}
+    SkPath fPath;
+    SkDrawShadowRec fRec;
+    void draw(SkCanvas* c, const SkMatrix&) const { c->private_draw_shadow_rec(fPath, fRec); }
+};
+}
+
+template <typename T, typename... Args>
+void* DisplayListData::push(size_t pod, Args&&... args) {
+    size_t skip = SkAlignPtr(sizeof(T) + pod);
+    SkASSERT(skip < (1 << 24));
+    if (fUsed + skip > fReserved) {
+        static_assert(SkIsPow2(SKLITEDL_PAGE), "This math needs updating for non-pow2.");
+        // Next greater multiple of SKLITEDL_PAGE.
+        fReserved = (fUsed + skip + SKLITEDL_PAGE) & ~(SKLITEDL_PAGE - 1);
+        fBytes.realloc(fReserved);
+    }
+    SkASSERT(fUsed + skip <= fReserved);
+    auto op = (T*)(fBytes.get() + fUsed);
+    fUsed += skip;
+    new (op) T{std::forward<Args>(args)...};
+    op->type = (uint32_t)T::kType;
+    op->skip = skip;
+    return op + 1;
+}
+
+template <typename Fn, typename... Args>
+inline void DisplayListData::map(const Fn fns[], Args... args) const {
+    auto end = fBytes.get() + fUsed;
+    for (const uint8_t* ptr = fBytes.get(); ptr < end;) {
+        auto op = (const Op*)ptr;
+        auto type = op->type;
+        auto skip = op->skip;
+        if (auto fn = fns[type]) {  // We replace no-op functions with nullptrs
+            fn(op, args...);        // to avoid the overhead of a pointless call.
+        }
+        ptr += skip;
+    }
+}
+
+void DisplayListData::flush() {
+    this->push<Flush>(0);
+}
+
+void DisplayListData::save() {
+    this->push<Save>(0);
+}
+void DisplayListData::restore() {
+    this->push<Restore>(0);
+}
+void DisplayListData::saveLayer(const SkRect* bounds, const SkPaint* paint,
+                                const SkImageFilter* backdrop, const SkImage* clipMask,
+                                const SkMatrix* clipMatrix, SkCanvas::SaveLayerFlags flags) {
+    this->push<SaveLayer>(0, bounds, paint, backdrop, clipMask, clipMatrix, flags);
+}
+
+void DisplayListData::concat(const SkMatrix& matrix) {
+    this->push<Concat>(0, matrix);
+}
+void DisplayListData::setMatrix(const SkMatrix& matrix) {
+    this->push<SetMatrix>(0, matrix);
+}
+void DisplayListData::translate(SkScalar dx, SkScalar dy) {
+    this->push<Translate>(0, dx, dy);
+}
+
+void DisplayListData::clipPath(const SkPath& path, SkClipOp op, bool aa) {
+    this->push<ClipPath>(0, path, op, aa);
+}
+void DisplayListData::clipRect(const SkRect& rect, SkClipOp op, bool aa) {
+    this->push<ClipRect>(0, rect, op, aa);
+}
+void DisplayListData::clipRRect(const SkRRect& rrect, SkClipOp op, bool aa) {
+    this->push<ClipRRect>(0, rrect, op, aa);
+}
+void DisplayListData::clipRegion(const SkRegion& region, SkClipOp op) {
+    this->push<ClipRegion>(0, region, op);
+}
+
+void DisplayListData::drawPaint(const SkPaint& paint) {
+    this->push<DrawPaint>(0, paint);
+}
+void DisplayListData::drawPath(const SkPath& path, const SkPaint& paint) {
+    this->push<DrawPath>(0, path, paint);
+}
+void DisplayListData::drawRect(const SkRect& rect, const SkPaint& paint) {
+    this->push<DrawRect>(0, rect, paint);
+}
+void DisplayListData::drawRegion(const SkRegion& region, const SkPaint& paint) {
+    this->push<DrawRegion>(0, region, paint);
+}
+void DisplayListData::drawOval(const SkRect& oval, const SkPaint& paint) {
+    this->push<DrawOval>(0, oval, paint);
+}
+void DisplayListData::drawArc(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle,
+                              bool useCenter, const SkPaint& paint) {
+    this->push<DrawArc>(0, oval, startAngle, sweepAngle, useCenter, paint);
+}
+void DisplayListData::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+    this->push<DrawRRect>(0, rrect, paint);
+}
+void DisplayListData::drawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint& paint) {
+    this->push<DrawDRRect>(0, outer, inner, paint);
+}
+
+void DisplayListData::drawAnnotation(const SkRect& rect, const char* key, SkData* value) {
+    size_t bytes = strlen(key) + 1;
+    void* pod = this->push<DrawAnnotation>(bytes, rect, value);
+    copy_v(pod, key, bytes);
+}
+void DisplayListData::drawDrawable(SkDrawable* drawable, const SkMatrix* matrix) {
+    this->push<DrawDrawable>(0, drawable, matrix);
+}
+void DisplayListData::drawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                                  const SkPaint* paint) {
+    this->push<DrawPicture>(0, picture, matrix, paint);
+}
+void DisplayListData::drawImage(sk_sp<const SkImage> image, SkScalar x, SkScalar y,
+                                const SkPaint* paint) {
+    this->push<DrawImage>(0, std::move(image), x, y, paint);
+}
+void DisplayListData::drawImageNine(sk_sp<const SkImage> image, const SkIRect& center,
+                                    const SkRect& dst, const SkPaint* paint) {
+    this->push<DrawImageNine>(0, std::move(image), center, dst, paint);
+}
+void DisplayListData::drawImageRect(sk_sp<const SkImage> image, const SkRect* src,
+                                    const SkRect& dst, const SkPaint* paint,
+                                    SkCanvas::SrcRectConstraint constraint) {
+    this->push<DrawImageRect>(0, std::move(image), src, dst, paint, constraint);
+}
+void DisplayListData::drawImageLattice(sk_sp<const SkImage> image, const SkCanvas::Lattice& lattice,
+                                       const SkRect& dst, const SkPaint* paint) {
+    int xs = lattice.fXCount, ys = lattice.fYCount;
+    int fs = lattice.fRectTypes ? (xs + 1) * (ys + 1) : 0;
+    size_t bytes = (xs + ys) * sizeof(int) + fs * sizeof(SkCanvas::Lattice::RectType) +
+                   fs * sizeof(SkColor);
+    SkASSERT(lattice.fBounds);
+    void* pod = this->push<DrawImageLattice>(bytes, std::move(image), xs, ys, fs, *lattice.fBounds,
+                                             dst, paint);
+    copy_v(pod, lattice.fXDivs, xs, lattice.fYDivs, ys, lattice.fColors, fs, lattice.fRectTypes,
+           fs);
+}
+
+void DisplayListData::drawText(const void* text, size_t bytes, SkScalar x, SkScalar y,
+                               const SkPaint& paint) {
+    void* pod = this->push<DrawText>(bytes, bytes, x, y, paint);
+    copy_v(pod, (const char*)text, bytes);
+}
+void DisplayListData::drawPosText(const void* text, size_t bytes, const SkPoint pos[],
+                                  const SkPaint& paint) {
+    int n = paint.countText(text, bytes);
+    void* pod = this->push<DrawPosText>(n * sizeof(SkPoint) + bytes, bytes, paint, n);
+    copy_v(pod, pos, n, (const char*)text, bytes);
+}
+void DisplayListData::drawPosTextH(const void* text, size_t bytes, const SkScalar xs[], SkScalar y,
+                                   const SkPaint& paint) {
+    int n = paint.countText(text, bytes);
+    void* pod = this->push<DrawPosTextH>(n * sizeof(SkScalar) + bytes, bytes, y, paint, n);
+    copy_v(pod, xs, n, (const char*)text, bytes);
+}
+void DisplayListData::drawTextRSXform(const void* text, size_t bytes, const SkRSXform xforms[],
+                                      const SkRect* cull, const SkPaint& paint) {
+    int n = paint.countText(text, bytes);
+    void* pod = this->push<DrawTextRSXform>(bytes + n * sizeof(SkRSXform), bytes, n, cull, paint);
+    copy_v(pod, xforms, n, (const char*)text, bytes);
+}
+void DisplayListData::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                   const SkPaint& paint) {
+    this->push<DrawTextBlob>(0, blob, x, y, paint);
+}
+
+void DisplayListData::drawPatch(const SkPoint points[12], const SkColor colors[4],
+                                const SkPoint texs[4], SkBlendMode bmode, const SkPaint& paint) {
+    this->push<DrawPatch>(0, points, colors, texs, bmode, paint);
+}
+void DisplayListData::drawPoints(SkCanvas::PointMode mode, size_t count, const SkPoint points[],
+                                 const SkPaint& paint) {
+    void* pod = this->push<DrawPoints>(count * sizeof(SkPoint), mode, count, paint);
+    copy_v(pod, points, count);
+}
+void DisplayListData::drawVertices(const SkVertices* vertices, const SkVertices::Bone bones[],
+                                   int boneCount, SkBlendMode mode, const SkPaint& paint) {
+    void* pod = this->push<DrawVertices>(boneCount * sizeof(SkVertices::Bone), vertices, boneCount,
+                                         mode, paint);
+    copy_v(pod, bones, boneCount);
+}
+void DisplayListData::drawAtlas(const SkImage* atlas, const SkRSXform xforms[], const SkRect texs[],
+                                const SkColor colors[], int count, SkBlendMode xfermode,
+                                const SkRect* cull, const SkPaint* paint) {
+    size_t bytes = count * (sizeof(SkRSXform) + sizeof(SkRect));
+    if (colors) {
+        bytes += count * sizeof(SkColor);
+    }
+    void* pod =
+            this->push<DrawAtlas>(bytes, atlas, count, xfermode, cull, paint, colors != nullptr);
+    copy_v(pod, xforms, count, texs, count, colors, colors ? count : 0);
+}
+void DisplayListData::drawShadowRec(const SkPath& path, const SkDrawShadowRec& rec) {
+    this->push<DrawShadowRec>(0, path, rec);
+}
+
+typedef void (*draw_fn)(const void*, SkCanvas*, const SkMatrix&);
+typedef void (*void_fn)(const void*);
+typedef void (*color_transform_fn)(const void*, ColorTransform);
+
+// All ops implement draw().
+#define X(T)                                                    \
+    [](const void* op, SkCanvas* c, const SkMatrix& original) { \
+        ((const T*)op)->draw(c, original);                      \
+    },
+static const draw_fn draw_fns[] = {
+#include "DisplayListOps.in"
+};
+#undef X
+
+// Most state ops (matrix, clip, save, restore) have a trivial destructor.
+#define X(T)                                                                                 \
+    !std::is_trivially_destructible<T>::value ? [](const void* op) { ((const T*)op)->~T(); } \
+                                              : (void_fn) nullptr,
+
+static const void_fn dtor_fns[] = {
+#include "DisplayListOps.in"
+};
+#undef X
+
+void DisplayListData::draw(SkCanvas* canvas) const {
+    SkAutoCanvasRestore acr(canvas, false);
+    this->map(draw_fns, canvas, canvas->getTotalMatrix());
+}
+
+DisplayListData::~DisplayListData() {
+    this->reset();
+}
+
+void DisplayListData::reset() {
+    this->map(dtor_fns);
+
+    // Leave fBytes and fReserved alone.
+    fUsed = 0;
+}
+
+template <class T>
+using has_paint_t = decltype(std::declval<T>().paint);
+
+template <class T>
+constexpr color_transform_fn colorTransformForOp() {
+    if
+        constexpr(std::experimental::is_detected_v<has_paint_t, T>) {
+            return [](const void* op, ColorTransform transform) {
+                // TODO: We should be const. Or not. Or just use a different map
+                // Unclear, but this is the quick fix
+                transformPaint(transform,
+                               const_cast<SkPaint*>(&(reinterpret_cast<const T*>(op)->paint)));
+            };
+        }
+    else {
+        return nullptr;
+    }
+}
+
+#define X(T) colorTransformForOp<T>(),
+static const color_transform_fn color_transform_fns[] = {
+#include "DisplayListOps.in"
+};
+#undef X
+
+void DisplayListData::applyColorTransform(ColorTransform transform) {
+    this->map(color_transform_fns, transform);
+}
+
+RecordingCanvas::RecordingCanvas() : INHERITED(1, 1), fDL(nullptr) {}
+
+void RecordingCanvas::reset(DisplayListData* dl, const SkIRect& bounds) {
+    this->resetCanvas(bounds.right(), bounds.bottom());
+    fDL = dl;
+}
+
+sk_sp<SkSurface> RecordingCanvas::onNewSurface(const SkImageInfo&, const SkSurfaceProps&) {
+    return nullptr;
+}
+
+void RecordingCanvas::onFlush() {
+    fDL->flush();
+}
+
+void RecordingCanvas::willSave() {
+    fDL->save();
+}
+SkCanvas::SaveLayerStrategy RecordingCanvas::getSaveLayerStrategy(const SaveLayerRec& rec) {
+    fDL->saveLayer(rec.fBounds, rec.fPaint, rec.fBackdrop, rec.fClipMask, rec.fClipMatrix,
+                   rec.fSaveLayerFlags);
+    return SkCanvas::kNoLayer_SaveLayerStrategy;
+}
+void RecordingCanvas::willRestore() {
+    fDL->restore();
+}
+
+void RecordingCanvas::didConcat(const SkMatrix& matrix) {
+    fDL->concat(matrix);
+}
+void RecordingCanvas::didSetMatrix(const SkMatrix& matrix) {
+    fDL->setMatrix(matrix);
+}
+void RecordingCanvas::didTranslate(SkScalar dx, SkScalar dy) {
+    fDL->translate(dx, dy);
+}
+
+void RecordingCanvas::onClipRect(const SkRect& rect, SkClipOp op, ClipEdgeStyle style) {
+    fDL->clipRect(rect, op, style == kSoft_ClipEdgeStyle);
+    this->INHERITED::onClipRect(rect, op, style);
+}
+void RecordingCanvas::onClipRRect(const SkRRect& rrect, SkClipOp op, ClipEdgeStyle style) {
+    fDL->clipRRect(rrect, op, style == kSoft_ClipEdgeStyle);
+    this->INHERITED::onClipRRect(rrect, op, style);
+}
+void RecordingCanvas::onClipPath(const SkPath& path, SkClipOp op, ClipEdgeStyle style) {
+    fDL->clipPath(path, op, style == kSoft_ClipEdgeStyle);
+    this->INHERITED::onClipPath(path, op, style);
+}
+void RecordingCanvas::onClipRegion(const SkRegion& region, SkClipOp op) {
+    fDL->clipRegion(region, op);
+    this->INHERITED::onClipRegion(region, op);
+}
+
+void RecordingCanvas::onDrawPaint(const SkPaint& paint) {
+    fDL->drawPaint(paint);
+}
+void RecordingCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
+    fDL->drawPath(path, paint);
+}
+void RecordingCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
+    fDL->drawRect(rect, paint);
+}
+void RecordingCanvas::onDrawRegion(const SkRegion& region, const SkPaint& paint) {
+    fDL->drawRegion(region, paint);
+}
+void RecordingCanvas::onDrawOval(const SkRect& oval, const SkPaint& paint) {
+    fDL->drawOval(oval, paint);
+}
+void RecordingCanvas::onDrawArc(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle,
+                                bool useCenter, const SkPaint& paint) {
+    fDL->drawArc(oval, startAngle, sweepAngle, useCenter, paint);
+}
+void RecordingCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
+    fDL->drawRRect(rrect, paint);
+}
+void RecordingCanvas::onDrawDRRect(const SkRRect& out, const SkRRect& in, const SkPaint& paint) {
+    fDL->drawDRRect(out, in, paint);
+}
+
+void RecordingCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) {
+    fDL->drawDrawable(drawable, matrix);
+}
+void RecordingCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                                    const SkPaint* paint) {
+    fDL->drawPicture(picture, matrix, paint);
+}
+void RecordingCanvas::onDrawAnnotation(const SkRect& rect, const char key[], SkData* val) {
+    fDL->drawAnnotation(rect, key, val);
+}
+
+void RecordingCanvas::onDrawText(const void* text, size_t bytes, SkScalar x, SkScalar y,
+                                 const SkPaint& paint) {
+    fDL->drawText(text, bytes, x, y, paint);
+}
+void RecordingCanvas::onDrawPosText(const void* text, size_t bytes, const SkPoint pos[],
+                                    const SkPaint& paint) {
+    fDL->drawPosText(text, bytes, pos, paint);
+}
+void RecordingCanvas::onDrawPosTextH(const void* text, size_t bytes, const SkScalar xs[],
+                                     SkScalar y, const SkPaint& paint) {
+    fDL->drawPosTextH(text, bytes, xs, y, paint);
+}
+void RecordingCanvas::onDrawTextRSXform(const void* text, size_t bytes, const SkRSXform xform[],
+                                        const SkRect* cull, const SkPaint& paint) {
+    fDL->drawTextRSXform(text, bytes, xform, cull, paint);
+}
+void RecordingCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                     const SkPaint& paint) {
+    fDL->drawTextBlob(blob, x, y, paint);
+}
+
+void RecordingCanvas::onDrawBitmap(const SkBitmap& bm, SkScalar x, SkScalar y,
+                                   const SkPaint* paint) {
+    fDL->drawImage(SkImage::MakeFromBitmap(bm), x, y, paint);
+}
+void RecordingCanvas::onDrawBitmapNine(const SkBitmap& bm, const SkIRect& center, const SkRect& dst,
+                                       const SkPaint* paint) {
+    fDL->drawImageNine(SkImage::MakeFromBitmap(bm), center, dst, paint);
+}
+void RecordingCanvas::onDrawBitmapRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,
+                                       const SkPaint* paint, SrcRectConstraint constraint) {
+    fDL->drawImageRect(SkImage::MakeFromBitmap(bm), src, dst, paint, constraint);
+}
+void RecordingCanvas::onDrawBitmapLattice(const SkBitmap& bm, const SkCanvas::Lattice& lattice,
+                                          const SkRect& dst, const SkPaint* paint) {
+    fDL->drawImageLattice(SkImage::MakeFromBitmap(bm), lattice, dst, paint);
+}
+
+void RecordingCanvas::onDrawImage(const SkImage* img, SkScalar x, SkScalar y,
+                                  const SkPaint* paint) {
+    fDL->drawImage(sk_ref_sp(img), x, y, paint);
+}
+void RecordingCanvas::onDrawImageNine(const SkImage* img, const SkIRect& center, const SkRect& dst,
+                                      const SkPaint* paint) {
+    fDL->drawImageNine(sk_ref_sp(img), center, dst, paint);
+}
+void RecordingCanvas::onDrawImageRect(const SkImage* img, const SkRect* src, const SkRect& dst,
+                                      const SkPaint* paint, SrcRectConstraint constraint) {
+    fDL->drawImageRect(sk_ref_sp(img), src, dst, paint, constraint);
+}
+void RecordingCanvas::onDrawImageLattice(const SkImage* img, const SkCanvas::Lattice& lattice,
+                                         const SkRect& dst, const SkPaint* paint) {
+    fDL->drawImageLattice(sk_ref_sp(img), lattice, dst, paint);
+}
+
+void RecordingCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                                  const SkPoint texCoords[4], SkBlendMode bmode,
+                                  const SkPaint& paint) {
+    fDL->drawPatch(cubics, colors, texCoords, bmode, paint);
+}
+void RecordingCanvas::onDrawPoints(SkCanvas::PointMode mode, size_t count, const SkPoint pts[],
+                                   const SkPaint& paint) {
+    fDL->drawPoints(mode, count, pts, paint);
+}
+void RecordingCanvas::onDrawVerticesObject(const SkVertices* vertices,
+                                          const SkVertices::Bone bones[], int boneCount,
+                                          SkBlendMode mode, const SkPaint& paint) {
+    fDL->drawVertices(vertices, bones, boneCount, mode, paint);
+}
+void RecordingCanvas::onDrawAtlas(const SkImage* atlas, const SkRSXform xforms[],
+                                  const SkRect texs[], const SkColor colors[], int count,
+                                  SkBlendMode bmode, const SkRect* cull, const SkPaint* paint) {
+    fDL->drawAtlas(atlas, xforms, texs, colors, count, bmode, cull, paint);
+}
+void RecordingCanvas::onDrawShadowRec(const SkPath& path, const SkDrawShadowRec& rec) {
+    fDL->drawShadowRec(path, rec);
+}
+
+};  // namespace uirenderer
+};  // namespace android
diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h
new file mode 100644
index 0000000..32ce1d3
--- /dev/null
+++ b/libs/hwui/RecordingCanvas.h
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "CanvasTransform.h"
+#include "hwui/Canvas.h"
+#include "utils/Macros.h"
+#include "utils/TypeLogic.h"
+
+#include "SkCanvas.h"
+#include "SkCanvasVirtualEnforcer.h"
+#include "SkDrawable.h"
+#include "SkNoDrawCanvas.h"
+#include "SkPaint.h"
+#include "SkPath.h"
+#include "SkRect.h"
+#include "SkTDArray.h"
+#include "SkTemplates.h"
+
+#include <vector>
+
+namespace android {
+namespace uirenderer {
+
+enum class DisplayListOpType : uint8_t {
+#define X(T) T,
+#include "DisplayListOps.in"
+#undef X
+};
+
+struct DisplayListOp {
+    const uint8_t type : 8;
+    const uint32_t skip : 24;
+};
+
+static_assert(sizeof(DisplayListOp) == 4);
+
+class RecordingCanvas;
+
+class DisplayListData final {
+public:
+    ~DisplayListData();
+
+    void draw(SkCanvas* canvas) const;
+
+    void reset();
+    bool empty() const { return fUsed == 0; }
+
+    void applyColorTransform(ColorTransform transform);
+
+private:
+    friend class RecordingCanvas;
+
+    void flush();
+
+    void save();
+    void saveLayer(const SkRect*, const SkPaint*, const SkImageFilter*, const SkImage*,
+                   const SkMatrix*, SkCanvas::SaveLayerFlags);
+    void restore();
+
+    void concat(const SkMatrix&);
+    void setMatrix(const SkMatrix&);
+    void translate(SkScalar, SkScalar);
+    void translateZ(SkScalar);
+
+    void clipPath(const SkPath&, SkClipOp, bool aa);
+    void clipRect(const SkRect&, SkClipOp, bool aa);
+    void clipRRect(const SkRRect&, SkClipOp, bool aa);
+    void clipRegion(const SkRegion&, SkClipOp);
+
+    void drawPaint(const SkPaint&);
+    void drawPath(const SkPath&, const SkPaint&);
+    void drawRect(const SkRect&, const SkPaint&);
+    void drawRegion(const SkRegion&, const SkPaint&);
+    void drawOval(const SkRect&, const SkPaint&);
+    void drawArc(const SkRect&, SkScalar, SkScalar, bool, const SkPaint&);
+    void drawRRect(const SkRRect&, const SkPaint&);
+    void drawDRRect(const SkRRect&, const SkRRect&, const SkPaint&);
+
+    void drawAnnotation(const SkRect&, const char*, SkData*);
+    void drawDrawable(SkDrawable*, const SkMatrix*);
+    void drawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
+
+    void drawText(const void*, size_t, SkScalar, SkScalar, const SkPaint&);
+    void drawPosText(const void*, size_t, const SkPoint[], const SkPaint&);
+    void drawPosTextH(const void*, size_t, const SkScalar[], SkScalar, const SkPaint&);
+    void drawTextRSXform(const void*, size_t, const SkRSXform[], const SkRect*, const SkPaint&);
+    void drawTextBlob(const SkTextBlob*, SkScalar, SkScalar, const SkPaint&);
+
+    void drawImage(sk_sp<const SkImage>, SkScalar, SkScalar, const SkPaint*);
+    void drawImageNine(sk_sp<const SkImage>, const SkIRect&, const SkRect&, const SkPaint*);
+    void drawImageRect(sk_sp<const SkImage>, const SkRect*, const SkRect&, const SkPaint*,
+                       SkCanvas::SrcRectConstraint);
+    void drawImageLattice(sk_sp<const SkImage>, const SkCanvas::Lattice&, const SkRect&,
+                          const SkPaint*);
+
+    void drawPatch(const SkPoint[12], const SkColor[4], const SkPoint[4], SkBlendMode,
+                   const SkPaint&);
+    void drawPoints(SkCanvas::PointMode, size_t, const SkPoint[], const SkPaint&);
+    void drawVertices(const SkVertices*, const SkVertices::Bone bones[], int boneCount, SkBlendMode,
+                      const SkPaint&);
+    void drawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int,
+                   SkBlendMode, const SkRect*, const SkPaint*);
+    void drawShadowRec(const SkPath&, const SkDrawShadowRec&);
+
+    template <typename T, typename... Args>
+    void* push(size_t, Args&&...);
+
+    template <typename Fn, typename... Args>
+    void map(const Fn[], Args...) const;
+
+    SkAutoTMalloc<uint8_t> fBytes;
+    size_t fUsed = 0;
+    size_t fReserved = 0;
+};
+
+class RecordingCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
+public:
+    RecordingCanvas();
+    void reset(DisplayListData*, const SkIRect& bounds);
+
+    sk_sp<SkSurface> onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+
+    void willSave() override;
+    SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override;
+    void willRestore() override;
+
+    void onFlush() override;
+
+    void didConcat(const SkMatrix&) override;
+    void didSetMatrix(const SkMatrix&) override;
+    void didTranslate(SkScalar, SkScalar) override;
+
+    void onClipRect(const SkRect&, SkClipOp, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkClipOp, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkClipOp, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion&, SkClipOp) override;
+
+    void onDrawPaint(const SkPaint&) override;
+    void onDrawPath(const SkPath&, const SkPaint&) override;
+    void onDrawRect(const SkRect&, const SkPaint&) override;
+    void onDrawRegion(const SkRegion&, const SkPaint&) override;
+    void onDrawOval(const SkRect&, const SkPaint&) override;
+    void onDrawArc(const SkRect&, SkScalar, SkScalar, bool, const SkPaint&) override;
+    void onDrawRRect(const SkRRect&, const SkPaint&) override;
+    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
+
+    void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
+    void onDrawAnnotation(const SkRect&, const char[], SkData*) override;
+
+    void onDrawText(const void*, size_t, SkScalar x, SkScalar y, const SkPaint&) override;
+    void onDrawPosText(const void*, size_t, const SkPoint[], const SkPaint&) override;
+    void onDrawPosTextH(const void*, size_t, const SkScalar[], SkScalar, const SkPaint&) override;
+
+    void onDrawTextRSXform(const void*, size_t, const SkRSXform[], const SkRect*,
+                           const SkPaint&) override;
+    void onDrawTextBlob(const SkTextBlob*, SkScalar, SkScalar, const SkPaint&) override;
+
+    void onDrawBitmap(const SkBitmap&, SkScalar, SkScalar, const SkPaint*) override;
+    void onDrawBitmapLattice(const SkBitmap&, const Lattice&, const SkRect&,
+                             const SkPaint*) override;
+    void onDrawBitmapNine(const SkBitmap&, const SkIRect&, const SkRect&, const SkPaint*) override;
+    void onDrawBitmapRect(const SkBitmap&, const SkRect*, const SkRect&, const SkPaint*,
+                          SrcRectConstraint) override;
+
+    void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override;
+    void onDrawImageLattice(const SkImage*, const Lattice&, const SkRect&, const SkPaint*) override;
+    void onDrawImageNine(const SkImage*, const SkIRect&, const SkRect&, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,
+                         SrcRectConstraint) override;
+
+    void onDrawPatch(const SkPoint[12], const SkColor[4], const SkPoint[4], SkBlendMode,
+                     const SkPaint&) override;
+    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+    void onDrawVerticesObject(const SkVertices*, const SkVertices::Bone bones[], int boneCount,
+                              SkBlendMode, const SkPaint&) override;
+    void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int,
+                     SkBlendMode, const SkRect*, const SkPaint*) override;
+    void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&) override;
+
+private:
+    typedef SkCanvasVirtualEnforcer<SkNoDrawCanvas> INHERITED;
+
+    DisplayListData* fDL;
+};
+
+};  // namespace uirenderer
+};  // namespace android
\ No newline at end of file
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index a2e1f60..d5afb20 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -272,6 +272,20 @@
     mStagingDisplayList = nullptr;
     if (mDisplayList) {
         mDisplayList->syncContents();
+        if (CC_UNLIKELY(Properties::forceDarkMode)) {
+            auto usage = usageHint();
+            if (usage == UsageHint::Unknown) {
+                if (mDisplayList->mChildNodes.size() > 1) {
+                    usage = UsageHint::Background;
+                } else if (mDisplayList->mChildNodes.size() == 1 &&
+                           mDisplayList->mChildNodes.front().getRenderNode()->usageHint() !=
+                                   UsageHint::Background) {
+                    usage = UsageHint::Background;
+                }
+            }
+            mDisplayList->mDisplayList.applyColorTransform(
+                    usage == UsageHint::Background ? ColorTransform::Dark : ColorTransform::Light);
+        }
     }
 }
 
diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h
index 8393288..83b0c22 100644
--- a/libs/hwui/RenderNode.h
+++ b/libs/hwui/RenderNode.h
@@ -209,13 +209,9 @@
 
     void output(std::ostream& output, uint32_t level);
 
-    void setUsageHint(UsageHint usageHint) {
-        mUsageHint = usageHint;
-    }
+    void setUsageHint(UsageHint usageHint) { mUsageHint = usageHint; }
 
-    UsageHint usageHint() const {
-        return mUsageHint;
-    }
+    UsageHint usageHint() const { return mUsageHint; }
 
 private:
     void computeOrderingImpl(RenderNodeOp* opState,
diff --git a/libs/hwui/hwui/Bitmap.cpp b/libs/hwui/hwui/Bitmap.cpp
index 7a8d026..a7d37f8 100644
--- a/libs/hwui/hwui/Bitmap.cpp
+++ b/libs/hwui/hwui/Bitmap.cpp
@@ -34,8 +34,8 @@
 #include <SkImagePriv.h>
 #include <SkToSRGBColorFilter.h>
 
-#include <limits>
 #include <SkHighContrastFilter.h>
+#include <limits>
 
 namespace android {
 
@@ -333,17 +333,17 @@
 
     // TODO: Move this to the canvas (or other?) layer where we have the target lightness
     // mode and can selectively do the right thing.
-    if (palette() != BitmapPalette::Unknown && uirenderer::Properties::forceDarkMode) {
-        SkHighContrastConfig config;
-        config.fInvertStyle = SkHighContrastConfig::InvertStyle::kInvertLightness;
-        *outputColorFilter = SkHighContrastFilter::Make(config)->makeComposed(*outputColorFilter);
-    }
+    //    if (palette() != BitmapPalette::Unknown && uirenderer::Properties::forceDarkMode) {
+    //        SkHighContrastConfig config;
+    //        config.fInvertStyle = SkHighContrastConfig::InvertStyle::kInvertLightness;
+    //        *outputColorFilter =
+    //        SkHighContrastFilter::Make(config)->makeComposed(*outputColorFilter);
+    //    }
     return image;
 }
 
 class MinMaxAverage {
 public:
-
     void add(float sample) {
         if (mCount == 0) {
             mMin = sample;
@@ -356,21 +356,13 @@
         mCount++;
     }
 
-    float average() {
-        return mTotal / mCount;
-    }
+    float average() { return mTotal / mCount; }
 
-    float min() {
-        return mMin;
-    }
+    float min() { return mMin; }
 
-    float max() {
-        return mMax;
-    }
+    float max() { return mMax; }
 
-    float delta() {
-        return mMax - mMin;
-    }
+    float delta() { return mMax - mMin; }
 
 private:
     float mMin = 0.0f;
@@ -413,14 +405,15 @@
     // TODO: Tune the coverage threshold
     if (sampledCount < 5) {
         ALOGV("Not enough samples, only found %d for image sized %dx%d, format = %d, alpha = %d",
-              sampledCount, info.width(), info.height(), (int) info.colorType(), (int) info.alphaType());
+              sampledCount, info.width(), info.height(), (int)info.colorType(),
+              (int)info.alphaType());
         return BitmapPalette::Unknown;
     }
 
-    ALOGV("samples = %d, hue [min = %f, max = %f, avg = %f]; saturation [min = %f, max = %f, avg = %f]",
-          sampledCount,
-          hue.min(), hue.max(), hue.average(),
-          saturation.min(), saturation.max(), saturation.average());
+    ALOGV("samples = %d, hue [min = %f, max = %f, avg = %f]; saturation [min = %f, max = %f, avg = "
+          "%f]",
+          sampledCount, hue.min(), hue.max(), hue.average(), saturation.min(), saturation.max(),
+          saturation.average());
 
     if (hue.delta() <= 20 && saturation.delta() <= .1f) {
         if (value.average() >= .5f) {
diff --git a/libs/hwui/hwui/Bitmap.h b/libs/hwui/hwui/Bitmap.h
index d268042..170335d 100644
--- a/libs/hwui/hwui/Bitmap.h
+++ b/libs/hwui/hwui/Bitmap.h
@@ -69,7 +69,8 @@
     Bitmap(void* address, void* context, FreeFunc freeFunc, const SkImageInfo& info,
            size_t rowBytes);
     Bitmap(void* address, int fd, size_t mappedSize, const SkImageInfo& info, size_t rowBytes);
-    Bitmap(GraphicBuffer* buffer, const SkImageInfo& info, BitmapPalette palette = BitmapPalette::Unknown);
+    Bitmap(GraphicBuffer* buffer, const SkImageInfo& info,
+           BitmapPalette palette = BitmapPalette::Unknown);
 
     int rowBytesAsPixels() const { return rowBytes() >> mInfo.shiftPerPixel(); }
 
diff --git a/libs/hwui/pipeline/skia/DumpOpsCanvas.h b/libs/hwui/pipeline/skia/DumpOpsCanvas.h
index 1f83d1a..dcfe6b3 100644
--- a/libs/hwui/pipeline/skia/DumpOpsCanvas.h
+++ b/libs/hwui/pipeline/skia/DumpOpsCanvas.h
@@ -94,11 +94,6 @@
         mOutput << mIdent << "drawPosTextH" << std::endl;
     }
 
-    void onDrawTextOnPath(const void*, size_t, const SkPath&, const SkMatrix*,
-                          const SkPaint&) override {
-        mOutput << mIdent << "drawTextOnPath" << std::endl;
-    }
-
     void onDrawTextRSXform(const void*, size_t, const SkRSXform[], const SkRect*,
                            const SkPaint&) override {
         mOutput << mIdent << "drawTextRSXform" << std::endl;
diff --git a/libs/hwui/pipeline/skia/ShaderCache.cpp b/libs/hwui/pipeline/skia/ShaderCache.cpp
index 6700748..073b481 100644
--- a/libs/hwui/pipeline/skia/ShaderCache.cpp
+++ b/libs/hwui/pipeline/skia/ShaderCache.cpp
@@ -18,6 +18,8 @@
 #include <algorithm>
 #include <log/log.h>
 #include <thread>
+#include <array>
+#include <openssl/sha.h>
 #include "FileBlobCache.h"
 #include "Properties.h"
 #include "utils/TraceUtils.h"
@@ -41,7 +43,40 @@
     return sCache;
 }
 
-void ShaderCache::initShaderDiskCache() {
+bool ShaderCache::validateCache(const void* identity, ssize_t size) {
+    if (nullptr == identity && size == 0)
+        return true;
+
+    if (nullptr == identity || size < 0) {
+        if (CC_UNLIKELY(Properties::debugLevel & kDebugCaches)) {
+            ALOGW("ShaderCache::validateCache invalid cache identity");
+        }
+        mBlobCache->clear();
+        return false;
+    }
+
+    SHA256_CTX ctx;
+    SHA256_Init(&ctx);
+
+    SHA256_Update(&ctx, identity, size);
+    mIDHash.resize(SHA256_DIGEST_LENGTH);
+    SHA256_Final(mIDHash.data(), &ctx);
+
+    std::array<uint8_t, SHA256_DIGEST_LENGTH> hash;
+    auto key = sIDKey;
+    auto loaded = mBlobCache->get(&key, sizeof(key), hash.data(), hash.size());
+
+    if (loaded && std::equal(hash.begin(), hash.end(), mIDHash.begin()))
+        return true;
+
+    if (CC_UNLIKELY(Properties::debugLevel & kDebugCaches)) {
+        ALOGW("ShaderCache::validateCache cache validation fails");
+    }
+    mBlobCache->clear();
+    return false;
+}
+
+void ShaderCache::initShaderDiskCache(const void* identity, ssize_t size) {
     ATRACE_NAME("initShaderDiskCache");
     std::lock_guard<std::mutex> lock(mMutex);
 
@@ -50,6 +85,7 @@
     // desktop / laptop GPUs. Thus, disable the shader disk cache for emulator builds.
     if (!Properties::runningInEmulator && mFilename.length() > 0) {
         mBlobCache.reset(new FileBlobCache(maxKeySize, maxValueSize, maxTotalSize, mFilename));
+        validateCache(identity, size);
         mInitialized = true;
     }
 }
@@ -104,6 +140,18 @@
     return SkData::MakeFromMalloc(valueBuffer, valueSize);
 }
 
+void ShaderCache::saveToDiskLocked() {
+    ATRACE_NAME("ShaderCache::saveToDiskLocked");
+    if (mInitialized && mBlobCache && mSavePending) {
+        if (mIDHash.size()) {
+            auto key = sIDKey;
+            mBlobCache->set(&key, sizeof(key), mIDHash.data(), mIDHash.size());
+        }
+        mBlobCache->writeToFile();
+    }
+    mSavePending = false;
+}
+
 void ShaderCache::store(const SkData& key, const SkData& data) {
     ATRACE_NAME("ShaderCache::store");
     std::lock_guard<std::mutex> lock(mMutex);
@@ -129,11 +177,7 @@
         std::thread deferredSaveThread([this]() {
             sleep(mDeferredSaveDelay);
             std::lock_guard<std::mutex> lock(mMutex);
-            ATRACE_NAME("ShaderCache::saveToDisk");
-            if (mInitialized && mBlobCache) {
-                mBlobCache->writeToFile();
-            }
-            mSavePending = false;
+            saveToDiskLocked();
         });
         deferredSaveThread.detach();
     }
diff --git a/libs/hwui/pipeline/skia/ShaderCache.h b/libs/hwui/pipeline/skia/ShaderCache.h
index 27473d6..82804cf 100644
--- a/libs/hwui/pipeline/skia/ShaderCache.h
+++ b/libs/hwui/pipeline/skia/ShaderCache.h
@@ -40,12 +40,21 @@
     ANDROID_API static ShaderCache& get();
 
     /**
-     * "initShaderDiskCache" loads the serialized cache contents from disk and puts the ShaderCache
-     * into an initialized state, such that it is able to insert and retrieve entries from the
-     * cache.  This should be called when HWUI pipeline is initialized.  When not in the initialized
-     * state the load and store methods will return without performing any cache operations.
+     * initShaderDiskCache" loads the serialized cache contents from disk,
+     * optionally checks that the on-disk cache matches a provided identity,
+     * and puts the ShaderCache into an initialized state, such that it is
+     * able to insert and retrieve entries from the cache. If identity is
+     * non-null and validation fails, the cache is initialized but contains
+     * no data. If size is less than zero, the cache is initilaized but
+     * contains no data.
+     *
+     * This should be called when HWUI pipeline is initialized. When not in
+     * the initialized state the load and store methods will return without
+     * performing any cache operations.
      */
-    virtual void initShaderDiskCache();
+    virtual void initShaderDiskCache(const void *identity, ssize_t size);
+
+    virtual void initShaderDiskCache() { initShaderDiskCache(nullptr, 0); }
 
     /**
      * "setFilename" sets the name of the file that should be used to store
@@ -83,6 +92,19 @@
     BlobCache* getBlobCacheLocked();
 
     /**
+     * "validateCache" updates the cache to match the given identity.  If the
+     * cache currently has the wrong identity, all entries in the cache are cleared.
+     */
+    bool validateCache(const void* identity, ssize_t size);
+
+    /**
+     * "saveToDiskLocked" attemps to save the current contents of the cache to
+     * disk. If the identity hash exists, we will insert the identity hash into
+     * the cache for next validation.
+     */
+    void saveToDiskLocked();
+
+    /**
      * "mInitialized" indicates whether the ShaderCache is in the initialized
      * state.  It is initialized to false at construction time, and gets set to
      * true when initialize is called.
@@ -111,6 +133,15 @@
     std::string mFilename;
 
     /**
+     * "mIDHash" is the current identity hash for the cache validation. It is
+     * initialized to an empty vector at construction time, and its content is
+     * generated in the call of the validateCache method. An empty vector
+     * indicates that cache validation is not performed, and the hash should
+     * not be stored on disk.
+     */
+    std::vector<uint8_t> mIDHash;
+
+    /**
      * "mSavePending" indicates whether or not a deferred save operation is
      * pending.  Each time a key/value pair is inserted into the cache via
      * load, a deferred save is initiated if one is not already pending.
@@ -140,6 +171,11 @@
      */
     static ShaderCache sCache;
 
+    /**
+     * "sIDKey" is the cache key of the identity hash
+     */
+    static constexpr uint8_t sIDKey = 0;
+
     friend class ShaderCacheTestUtils; //used for unit testing
 };
 
diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.h b/libs/hwui/pipeline/skia/SkiaDisplayList.h
index 6eff589..4f30f98 100644
--- a/libs/hwui/pipeline/skia/SkiaDisplayList.h
+++ b/libs/hwui/pipeline/skia/SkiaDisplayList.h
@@ -18,12 +18,11 @@
 
 #include "hwui/AnimatedImageDrawable.h"
 #include "GLFunctorDrawable.h"
+#include "RecordingCanvas.h"
 #include "RenderNodeDrawable.h"
 #include "TreeInfo.h"
 #include "utils/LinearAllocator.h"
 
-#include <SkLiteDL.h>
-#include <SkLiteRecorder.h>
 #include <deque>
 
 namespace android {
@@ -140,7 +139,7 @@
      */
     inline bool containsProjectionReceiver() const { return mProjectionReceiver; }
 
-    void attachRecorder(SkLiteRecorder* recorder, const SkIRect& bounds) {
+    void attachRecorder(RecordingCanvas* recorder, const SkIRect& bounds) {
         recorder->reset(&mDisplayList, bounds);
     }
 
@@ -160,7 +159,7 @@
     std::vector<SkImage*> mMutableImages;
     std::vector<VectorDrawableRoot*> mVectorDrawables;
     std::vector<AnimatedImageDrawable*> mAnimatedImages;
-    SkLiteDL mDisplayList;
+    DisplayListData mDisplayList;
 
     // mProjectionReceiver points to a child node (stored in mChildNodes) that is as a projection
     // receiver. It is set at record time and used at both prepare and draw tree traversals to
diff --git a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
index b9748af..83d7e6a 100644
--- a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
+++ b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
@@ -45,21 +45,13 @@
     }
 
     mDisplayList->attachRecorder(&mRecorder, SkIRect::MakeWH(width, height));
-    SkCanvas* canvas = &mRecorder;
-    if (renderNode) {
-        mWrappedCanvas = makeTransformCanvas(&mRecorder, renderNode->usageHint());
-        if (mWrappedCanvas) {
-            canvas = mWrappedCanvas.get();
-        }
-    }
-    SkiaCanvas::reset(canvas);
+    SkiaCanvas::reset(&mRecorder);
 }
 
 uirenderer::DisplayList* SkiaRecordingCanvas::finishRecording() {
     // close any existing chunks if necessary
     insertReorderBarrier(false);
     mRecorder.restoreToCount(1);
-    mWrappedCanvas = nullptr;
     return mDisplayList.release();
 }
 
diff --git a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.h b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.h
index 50d84d6..988728d 100644
--- a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.h
+++ b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <SkLiteRecorder.h>
+#include "RecordingCanvas.h"
 #include "ReorderBarrierDrawables.h"
 #include "SkiaCanvas.h"
 #include "SkiaDisplayList.h"
@@ -76,9 +76,8 @@
                                     uirenderer::GlFunctorLifecycleListener* listener) override;
 
 private:
-    SkLiteRecorder mRecorder;
+    RecordingCanvas mRecorder;
     std::unique_ptr<SkiaDisplayList> mDisplayList;
-    std::unique_ptr<SkCanvas> mWrappedCanvas;
     StartReorderBarrierDrawable* mCurrentBarrier;
 
     /**
diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp
index bec80b1e..82bfc49 100644
--- a/libs/hwui/renderthread/CacheManager.cpp
+++ b/libs/hwui/renderthread/CacheManager.cpp
@@ -50,7 +50,6 @@
     mVectorDrawableAtlas = new skiapipeline::VectorDrawableAtlas(
             mMaxSurfaceArea / 2,
             skiapipeline::VectorDrawableAtlas::StorageMode::disallowSharedSurface);
-    skiapipeline::ShaderCache::get().initShaderDiskCache();
 }
 
 void CacheManager::reset(sk_sp<GrContext> context) {
@@ -103,7 +102,7 @@
     }
 };
 
-void CacheManager::configureContext(GrContextOptions* contextOptions) {
+void CacheManager::configureContext(GrContextOptions* contextOptions, const void* identity, ssize_t size) {
     contextOptions->fAllowPathMaskCaching = true;
 
     float screenMP = mMaxSurfaceArea / 1024.0f / 1024.0f;
@@ -133,7 +132,9 @@
         contextOptions->fExecutor = mTaskProcessor.get();
     }
 
-    contextOptions->fPersistentCache = &skiapipeline::ShaderCache::get();
+    auto& cache = skiapipeline::ShaderCache::get();
+    cache.initShaderDiskCache(identity, size);
+    contextOptions->fPersistentCache = &cache;
     contextOptions->fGpuPathRenderers &= ~GpuPathRenderers::kCoverageCounting;
 }
 
diff --git a/libs/hwui/renderthread/CacheManager.h b/libs/hwui/renderthread/CacheManager.h
index 7d73352..35fc91a 100644
--- a/libs/hwui/renderthread/CacheManager.h
+++ b/libs/hwui/renderthread/CacheManager.h
@@ -44,7 +44,7 @@
 public:
     enum class TrimMemoryMode { Complete, UiHidden };
 
-    void configureContext(GrContextOptions* context);
+    void configureContext(GrContextOptions* context, const void* identity, ssize_t size);
     void trimMemory(TrimMemoryMode mode);
     void trimStaleResources();
     void dumpMemoryUsage(String8& log, const RenderState* renderState = nullptr);
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index c1284ec..36ffaee 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -191,7 +191,9 @@
     GrContextOptions options;
     options.fPreferExternalImagesOverES3 = true;
     options.fDisableDistanceFieldPaths = true;
-    cacheManager().configureContext(&options);
+    auto glesVersion = reinterpret_cast<const char*>(glGetString(GL_VERSION));
+    auto size = glesVersion ? strlen(glesVersion) : -1;
+    cacheManager().configureContext(&options, glesVersion, size);
     sk_sp<GrContext> grContext(GrContext::MakeGL(std::move(glInterface), options));
     LOG_ALWAYS_FATAL_IF(!grContext.get());
     setGrContext(grContext);
diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp
index 1517f57..cc4b87a 100644
--- a/libs/hwui/renderthread/VulkanManager.cpp
+++ b/libs/hwui/renderthread/VulkanManager.cpp
@@ -391,7 +391,8 @@
 
     GrContextOptions options;
     options.fDisableDistanceFieldPaths = true;
-    mRenderThread.cacheManager().configureContext(&options);
+    // TODO: get a string describing the SPIR-V compiler version and use it here
+    mRenderThread.cacheManager().configureContext(&options, nullptr, 0);
     sk_sp<GrContext> grContext(GrContext::MakeVulkan(backendContext, options));
     LOG_ALWAYS_FATAL_IF(!grContext.get());
     mRenderThread.setGrContext(grContext);
diff --git a/libs/hwui/tests/unit/FatalTestCanvas.h b/libs/hwui/tests/unit/FatalTestCanvas.h
index 9693ce7..89f0c52 100644
--- a/libs/hwui/tests/unit/FatalTestCanvas.h
+++ b/libs/hwui/tests/unit/FatalTestCanvas.h
@@ -42,10 +42,6 @@
                         const SkPaint& paint) {
         ADD_FAILURE() << "onDrawPosTextH not expected in this test";
     }
-    void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                          const SkMatrix* matrix, const SkPaint& paint) {
-        ADD_FAILURE() << "onDrawTextOnPath not expected in this test";
-    }
     void onDrawTextRSXform(const void* text, size_t byteLength, const SkRSXform[],
                            const SkRect* cullRect, const SkPaint& paint) {
         ADD_FAILURE() << "onDrawTextRSXform not expected in this test";
diff --git a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
index eb67e6c..48bc8e4 100644
--- a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
+++ b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
@@ -18,13 +18,13 @@
 #include <gtest/gtest.h>
 
 #include <SkClipStack.h>
-#include <SkLiteRecorder.h>
 #include <SkSurface_Base.h>
 #include <string.h>
 #include "AnimationContext.h"
 #include "DamageAccumulator.h"
 #include "FatalTestCanvas.h"
 #include "IContextFactory.h"
+#include "RecordingCanvas.h"
 #include "SkiaCanvas.h"
 #include "pipeline/skia/SkiaDisplayList.h"
 #include "pipeline/skia/SkiaOpenGLPipeline.h"
@@ -44,8 +44,8 @@
                 canvas.drawColor(Color::Red_500, SkBlendMode::kSrcOver);
             });
 
-    SkLiteDL skLiteDL;
-    SkLiteRecorder canvas;
+    DisplayListData skLiteDL;
+    RecordingCanvas canvas;
     canvas.reset(&skLiteDL, SkIRect::MakeWH(1, 1));
     canvas.translate(100, 100);
     RenderNodeDrawable drawable(rootNode.get(), &canvas);
diff --git a/libs/hwui/tests/unit/ShaderCacheTests.cpp b/libs/hwui/tests/unit/ShaderCacheTests.cpp
index 43080a9..1433aa0 100644
--- a/libs/hwui/tests/unit/ShaderCacheTests.cpp
+++ b/libs/hwui/tests/unit/ShaderCacheTests.cpp
@@ -48,11 +48,18 @@
      */
     static void terminate(ShaderCache& cache, bool saveContent) {
         std::lock_guard<std::mutex> lock(cache.mMutex);
-        if (cache.mInitialized && cache.mBlobCache && saveContent) {
-            cache.mBlobCache->writeToFile();
-        }
+        cache.mSavePending = saveContent;
+        cache.saveToDiskLocked();
         cache.mBlobCache = NULL;
     }
+
+    /**
+     *
+     */
+    template <typename T>
+    static bool validateCache(ShaderCache& cache, std::vector<T> hash) {
+        return cache.validateCache(hash.data(), hash.size() * sizeof(T));
+    }
 };
 
 } /* namespace skiapipeline */
@@ -75,26 +82,39 @@
     return false;
 }
 
-bool checkShader(const sk_sp<SkData>& shader, const char* program) {
-    sk_sp<SkData> shader2 = SkData::MakeWithCString(program);
-    return shader->size() == shader2->size()
-            && 0 == memcmp(shader->data(), shader2->data(), shader->size());
+inline bool
+checkShader(const sk_sp<SkData>& shader1, const sk_sp<SkData>& shader2) {
+    return nullptr != shader1 && nullptr != shader2 && shader1->size() == shader2->size()
+            && 0 == memcmp(shader1->data(), shader2->data(), shader1->size());
 }
 
-bool checkShader(const sk_sp<SkData>& shader, std::vector<char>& program) {
-    sk_sp<SkData> shader2 = SkData::MakeWithCopy(program.data(), program.size());
-    return shader->size() == shader2->size()
-            && 0 == memcmp(shader->data(), shader2->data(), shader->size());
+inline bool
+checkShader(const sk_sp<SkData>& shader, const char* program) {
+    sk_sp<SkData> shader2 = SkData::MakeWithCString(program);
+    return checkShader(shader, shader2);
+}
+
+template <typename T>
+bool checkShader(const sk_sp<SkData>& shader, std::vector<T>& program) {
+    sk_sp<SkData> shader2 = SkData::MakeWithCopy(program.data(), program.size() * sizeof(T));
+    return checkShader(shader, shader2);
 }
 
 void setShader(sk_sp<SkData>& shader, const char* program) {
     shader = SkData::MakeWithCString(program);
 }
 
-void setShader(sk_sp<SkData>& shader, std::vector<char>& program) {
-    shader = SkData::MakeWithCopy(program.data(), program.size());
+template <typename T>
+void setShader(sk_sp<SkData>& shader, std::vector<T>& buffer) {
+    shader = SkData::MakeWithCopy(buffer.data(), buffer.size() * sizeof(T));
 }
 
+template <typename T>
+void genRandomData(std::vector<T>& buffer) {
+    for (auto& data : buffer) {
+        data = T(std::rand());
+    }
+}
 
 
 #define GrProgramDescTest(a) (*SkData::MakeWithCString(#a).get())
@@ -110,6 +130,7 @@
     //remove any test files from previous test run
     int deleteFile = remove(cacheFile1.c_str());
     ASSERT_TRUE(0 == deleteFile || ENOENT == errno);
+    std::srand(0);
 
     //read the cache from a file that does not exist
     ShaderCache::get().setFilename(cacheFile1.c_str());
@@ -158,10 +179,8 @@
 
     //write and read big data chunk (50K)
     size_t dataSize = 50*1024;
-    std::vector<char> dataBuffer(dataSize);
-    for (size_t i = 0; i < dataSize; i++) {
-        dataBuffer[0] = dataSize % 256;
-    }
+    std::vector<uint8_t> dataBuffer(dataSize);
+    genRandomData(dataBuffer);
     setShader(inVS, dataBuffer);
     ShaderCache::get().store(GrProgramDescTest(432), *inVS.get());
     ShaderCacheTestUtils::terminate(ShaderCache::get(), true);
@@ -173,4 +192,96 @@
     remove(cacheFile1.c_str());
 }
 
+TEST(ShaderCacheTest, testCacheValidation) {
+    if (!folderExist(getExternalStorageFolder())) {
+        //don't run the test if external storage folder is not available
+        return;
+    }
+    std::string cacheFile1 =  getExternalStorageFolder() + "/shaderCacheTest1";
+    std::string cacheFile2 =  getExternalStorageFolder() + "/shaderCacheTest2";
+
+    //remove any test files from previous test run
+    int deleteFile = remove(cacheFile1.c_str());
+    ASSERT_TRUE(0 == deleteFile || ENOENT == errno);
+    std::srand(0);
+
+    //generate identity and read the cache from a file that does not exist
+    ShaderCache::get().setFilename(cacheFile1.c_str());
+    ShaderCacheTestUtils::setSaveDelay(ShaderCache::get(), 0); //disable deferred save
+    std::vector<uint8_t> identity(1024);
+    genRandomData(identity);
+    ShaderCache::get().initShaderDiskCache(identity.data(), identity.size() *
+                                           sizeof(decltype(identity)::value_type));
+
+    // generate random content in cache and store to disk
+    constexpr size_t numBlob(10);
+    constexpr size_t keySize(1024);
+    constexpr size_t dataSize(50 * 1024);
+
+    std::vector< std::pair<sk_sp<SkData>, sk_sp<SkData>> > blobVec(numBlob);
+    for (auto& blob : blobVec) {
+        std::vector<uint8_t> keyBuffer(keySize);
+        std::vector<uint8_t> dataBuffer(dataSize);
+        genRandomData(keyBuffer);
+        genRandomData(dataBuffer);
+
+        sk_sp<SkData> key, data;
+        setShader(key, keyBuffer);
+        setShader(data, dataBuffer);
+
+        blob = std::make_pair(key, data);
+        ShaderCache::get().store(*key.get(), *data.get());
+    }
+    ShaderCacheTestUtils::terminate(ShaderCache::get(), true);
+
+    // change to a file that does not exist and verify validation fails
+    ShaderCache::get().setFilename(cacheFile2.c_str());
+    ShaderCache::get().initShaderDiskCache();
+    ASSERT_FALSE( ShaderCacheTestUtils::validateCache(ShaderCache::get(), identity) );
+    ShaderCacheTestUtils::terminate(ShaderCache::get(), false);
+
+    // restore the original file and verify validation succeeds
+    ShaderCache::get().setFilename(cacheFile1.c_str());
+    ShaderCache::get().initShaderDiskCache(identity.data(), identity.size() *
+                                           sizeof(decltype(identity)::value_type));
+    ASSERT_TRUE( ShaderCacheTestUtils::validateCache(ShaderCache::get(), identity) );
+    for (const auto& blob : blobVec) {
+        auto outVS = ShaderCache::get().load(*blob.first.get());
+        ASSERT_TRUE( checkShader(outVS, blob.second) );
+    }
+
+    // generate error identity and verify load fails
+    ShaderCache::get().initShaderDiskCache(identity.data(), -1);
+    for (const auto& blob : blobVec) {
+        ASSERT_EQ( ShaderCache::get().load(*blob.first.get()), sk_sp<SkData>() );
+    }
+    ShaderCache::get().initShaderDiskCache(nullptr, identity.size() *
+                                           sizeof(decltype(identity)::value_type));
+    for (const auto& blob : blobVec) {
+        ASSERT_EQ( ShaderCache::get().load(*blob.first.get()), sk_sp<SkData>() );
+    }
+
+    // verify the cache validation again after load fails
+    ShaderCache::get().initShaderDiskCache(identity.data(), identity.size() *
+                                           sizeof(decltype(identity)::value_type));
+    ASSERT_TRUE( ShaderCacheTestUtils::validateCache(ShaderCache::get(), identity) );
+    for (const auto& blob : blobVec) {
+        auto outVS = ShaderCache::get().load(*blob.first.get());
+        ASSERT_TRUE( checkShader(outVS, blob.second) );
+    }
+
+    // generate another identity and verify load fails
+    for (auto& data : identity) {
+        data += std::rand();
+    }
+    ShaderCache::get().initShaderDiskCache(identity.data(), identity.size() *
+                                           sizeof(decltype(identity)::value_type));
+    for (const auto& blob : blobVec) {
+        ASSERT_EQ( ShaderCache::get().load(*blob.first.get()), sk_sp<SkData>() );
+    }
+
+    ShaderCacheTestUtils::terminate(ShaderCache::get(), false);
+    remove(cacheFile1.c_str());
+}
+
 }  // namespace
diff --git a/libs/hwui/tests/unit/SkiaDisplayListTests.cpp b/libs/hwui/tests/unit/SkiaDisplayListTests.cpp
index 88d6dcf..6c398ee 100644
--- a/libs/hwui/tests/unit/SkiaDisplayListTests.cpp
+++ b/libs/hwui/tests/unit/SkiaDisplayListTests.cpp
@@ -36,32 +36,36 @@
 }
 
 TEST(SkiaDisplayList, reset) {
-    SkiaDisplayList skiaDL;
+    std::unique_ptr<SkiaDisplayList> skiaDL;
+    {
+        SkiaRecordingCanvas canvas{nullptr, 1, 1};
+        canvas.drawColor(0, SkBlendMode::kSrc);
+        skiaDL.reset(canvas.finishRecording());
+    }
 
     SkCanvas dummyCanvas;
     RenderNodeDrawable drawable(nullptr, &dummyCanvas);
-    skiaDL.mChildNodes.emplace_back(nullptr, &dummyCanvas);
-    skiaDL.mChildFunctors.emplace_back(nullptr, nullptr, &dummyCanvas);
-    skiaDL.mMutableImages.push_back(nullptr);
-    skiaDL.mVectorDrawables.push_back(nullptr);
-    skiaDL.mDisplayList.drawAnnotation(SkRect::MakeWH(200, 200), "testAnnotation", nullptr);
-    skiaDL.mProjectionReceiver = &drawable;
+    skiaDL->mChildNodes.emplace_back(nullptr, &dummyCanvas);
+    skiaDL->mChildFunctors.emplace_back(nullptr, nullptr, &dummyCanvas);
+    skiaDL->mMutableImages.push_back(nullptr);
+    skiaDL->mVectorDrawables.push_back(nullptr);
+    skiaDL->mProjectionReceiver = &drawable;
 
-    ASSERT_FALSE(skiaDL.mChildNodes.empty());
-    ASSERT_FALSE(skiaDL.mChildFunctors.empty());
-    ASSERT_FALSE(skiaDL.mMutableImages.empty());
-    ASSERT_FALSE(skiaDL.mVectorDrawables.empty());
-    ASSERT_FALSE(skiaDL.isEmpty());
-    ASSERT_TRUE(skiaDL.mProjectionReceiver);
+    ASSERT_FALSE(skiaDL->mChildNodes.empty());
+    ASSERT_FALSE(skiaDL->mChildFunctors.empty());
+    ASSERT_FALSE(skiaDL->mMutableImages.empty());
+    ASSERT_FALSE(skiaDL->mVectorDrawables.empty());
+    ASSERT_FALSE(skiaDL->isEmpty());
+    ASSERT_TRUE(skiaDL->mProjectionReceiver);
 
-    skiaDL.reset();
+    skiaDL->reset();
 
-    ASSERT_TRUE(skiaDL.mChildNodes.empty());
-    ASSERT_TRUE(skiaDL.mChildFunctors.empty());
-    ASSERT_TRUE(skiaDL.mMutableImages.empty());
-    ASSERT_TRUE(skiaDL.mVectorDrawables.empty());
-    ASSERT_TRUE(skiaDL.isEmpty());
-    ASSERT_FALSE(skiaDL.mProjectionReceiver);
+    ASSERT_TRUE(skiaDL->mChildNodes.empty());
+    ASSERT_TRUE(skiaDL->mChildFunctors.empty());
+    ASSERT_TRUE(skiaDL->mMutableImages.empty());
+    ASSERT_TRUE(skiaDL->mVectorDrawables.empty());
+    ASSERT_TRUE(skiaDL->isEmpty());
+    ASSERT_FALSE(skiaDL->mProjectionReceiver);
 }
 
 TEST(SkiaDisplayList, reuseDisplayList) {
diff --git a/libs/hwui/tests/unit/SkiaPipelineTests.cpp b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
index 26b6000..a9124d9 100644
--- a/libs/hwui/tests/unit/SkiaPipelineTests.cpp
+++ b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
@@ -18,7 +18,6 @@
 #include <gtest/gtest.h>
 
 #include <SkClipStack.h>
-#include <SkLiteRecorder.h>
 #include <SkSurface_Base.h>
 #include <string.h>
 #include "AnimationContext.h"
diff --git a/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp b/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp
index ad5fdac..479c462 100644
--- a/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp
+++ b/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp
@@ -18,7 +18,6 @@
 #include <gtest/gtest.h>
 
 #include <SkClipStack.h>
-#include <SkLiteRecorder.h>
 #include <SkSurface_Base.h>
 #include <string.h>
 #include "AnimationContext.h"
diff --git a/libs/hwui/utils/LinearAllocator.cpp b/libs/hwui/utils/LinearAllocator.cpp
index 5a59de8..3e5021c 100644
--- a/libs/hwui/utils/LinearAllocator.cpp
+++ b/libs/hwui/utils/LinearAllocator.cpp
@@ -29,6 +29,7 @@
 
 #include <stdlib.h>
 #include <utils/Log.h>
+#include <utils/Macros.h>
 
 // The ideal size of a page allocation (these need to be multiples of 8)
 #define INITIAL_PAGE_SIZE ((size_t)512)  // 512b
@@ -41,15 +42,6 @@
 // Must be smaller than INITIAL_PAGE_SIZE
 #define MAX_WASTE_RATIO (0.5f)
 
-#if ALIGN_DOUBLE
-#define ALIGN_SZ (sizeof(double))
-#else
-#define ALIGN_SZ (sizeof(int))
-#endif
-
-#define ALIGN(x) (((x) + ALIGN_SZ - 1) & ~(ALIGN_SZ - 1))
-#define ALIGN_PTR(p) ((void*)(ALIGN((size_t)(p))))
-
 #if LOG_NDEBUG
 #define ADD_ALLOCATION()
 #define RM_ALLOCATION()
diff --git a/libs/hwui/utils/Macros.h b/libs/hwui/utils/Macros.h
index d758f29..eee6785 100644
--- a/libs/hwui/utils/Macros.h
+++ b/libs/hwui/utils/Macros.h
@@ -34,4 +34,13 @@
 
 #define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
 
+#if ALIGN_DOUBLE
+#define ALIGN_SZ (sizeof(double))
+#else
+#define ALIGN_SZ (sizeof(int))
+#endif
+
+#define ALIGN(x) (((x) + ALIGN_SZ - 1) & ~(ALIGN_SZ - 1))
+#define ALIGN_PTR(p) ((void*)(ALIGN((size_t)(p))))
+
 #endif /* MACROS_H */
diff --git a/libs/hwui/utils/TypeLogic.h b/libs/hwui/utils/TypeLogic.h
new file mode 100644
index 0000000..dbdad33
--- /dev/null
+++ b/libs/hwui/utils/TypeLogic.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <type_traits>
+
+namespace android::uirenderer {
+
+template <typename D, typename S> struct copy_const {
+    using type = std::conditional_t<std::is_const<S>::value, std::add_const_t<D>, D>;
+};
+template <typename D, typename S> using copy_const_t = typename copy_const<D, S>::type;
+
+template <typename D, typename S> struct copy_volatile {
+    using type = std::conditional_t<std::is_volatile<S>::value, std::add_volatile_t<D>, D>;
+};
+template <typename D, typename S> using copy_volatile_t = typename copy_volatile<D, S>::type;
+
+template <typename D, typename S> struct copy_cv {
+    using type = copy_volatile_t<copy_const_t<D, S>, S>;
+};
+
+template <typename D, typename S> using same_cv = copy_cv<std::remove_cv_t<D>, S>;
+template <typename D, typename S> using same_cv_t = typename same_cv<D, S>::type;
+
+}; // namespace android::uirenderer
\ No newline at end of file
diff --git a/libs/storage/Android.bp b/libs/storage/Android.bp
index 911bd1d..c19933e 100644
--- a/libs/storage/Android.bp
+++ b/libs/storage/Android.bp
@@ -6,6 +6,7 @@
         "IMountShutdownObserver.cpp",
         "IObbActionListener.cpp",
         "IMountService.cpp",
+        "ObbInfo.cpp",
     ],
 
     export_include_dirs: ["include"],
diff --git a/libs/storage/IMountService.cpp b/libs/storage/IMountService.cpp
index fa3d8bd..fd6e6e9 100644
--- a/libs/storage/IMountService.cpp
+++ b/libs/storage/IMountService.cpp
@@ -443,7 +443,7 @@
     }
 
     void mountObb(const String16& rawPath, const String16& canonicalPath, const String16& key,
-            const sp<IObbActionListener>& token, int32_t nonce)
+            const sp<IObbActionListener>& token, int32_t nonce, const sp<ObbInfo>& obbInfo)
     {
         Parcel data, reply;
         data.writeInterfaceToken(IMountService::getInterfaceDescriptor());
@@ -452,6 +452,7 @@
         data.writeString16(key);
         data.writeStrongBinder(IInterface::asBinder(token));
         data.writeInt32(nonce);
+        obbInfo->writeToParcel(&data);
         if (remote()->transact(TRANSACTION_mountObb, data, &reply) != NO_ERROR) {
             ALOGD("mountObb could not contact remote\n");
             return;
diff --git a/libs/storage/ObbInfo.cpp b/libs/storage/ObbInfo.cpp
new file mode 100644
index 0000000..1bb6b3a
--- /dev/null
+++ b/libs/storage/ObbInfo.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <storage/ObbInfo.h>
+
+#include <binder/Parcel.h>
+#include <utils/String16.h>
+#include <sys/types.h>
+
+namespace android {
+
+ObbInfo::ObbInfo(const String16 fileName, const String16 packageName, int32_t version,
+        int32_t flags, size_t saltSize, const uint8_t* salt) : mFileName(fileName),
+        mPackageName(packageName), mVersion(version), mFlags(flags), mSaltSize(saltSize),
+        mSalt(salt) {}
+
+ObbInfo::~ObbInfo() {}
+
+status_t ObbInfo::readFromParcel(const Parcel*) {
+    return INVALID_OPERATION;
+}
+
+status_t ObbInfo::writeToParcel(Parcel* p) const {
+    // Parcel write code must be kept in sync with
+    // frameworks/base/core/java/android/content/res/ObbInfo.java
+    p->writeString16(mFileName);
+    p->writeString16(mPackageName);
+    p->writeInt32(mVersion);
+    p->writeInt32(mFlags);
+    p->writeByteArray(mSaltSize, mSalt);
+    return OK;
+}
+
+}; // namespace android
\ No newline at end of file
diff --git a/libs/storage/include/storage/IMountService.h b/libs/storage/include/storage/IMountService.h
index c3d34d8..2463e02 100644
--- a/libs/storage/include/storage/IMountService.h
+++ b/libs/storage/include/storage/IMountService.h
@@ -20,6 +20,7 @@
 #include <storage/IMountServiceListener.h>
 #include <storage/IMountShutdownObserver.h>
 #include <storage/IObbActionListener.h>
+#include <storage/ObbInfo.h>
 
 #include <utils/String8.h>
 
@@ -64,7 +65,7 @@
     virtual void finishMediaUpdate() = 0;
     virtual void mountObb(const String16& rawPath, const String16& canonicalPath,
             const String16& key, const sp<IObbActionListener>& token,
-            const int32_t nonce) = 0;
+            const int32_t nonce, const sp<ObbInfo>& obbInfo) = 0;
     virtual void unmountObb(const String16& filename, const bool force,
             const sp<IObbActionListener>& token, const int32_t nonce) = 0;
     virtual bool isObbMounted(const String16& filename) = 0;
diff --git a/libs/storage/include/storage/ObbInfo.h b/libs/storage/include/storage/ObbInfo.h
new file mode 100644
index 0000000..e4cc353
--- /dev/null
+++ b/libs/storage/include/storage/ObbInfo.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_OBBINFO_H
+#define ANDROID_OBBINFO_H
+
+#include <binder/Parcelable.h>
+#include <utils/RefBase.h>
+#include <utils/String16.h>
+#include <sys/types.h>
+
+namespace android {
+
+class ObbInfo : public Parcelable, public virtual RefBase {
+
+public:
+    ObbInfo(const String16 fileName, const String16 packageName, int32_t version,
+            int32_t flags, size_t saltSize, const uint8_t* salt);
+    ~ObbInfo();
+
+    status_t writeToParcel(Parcel* parcel) const override;
+    status_t readFromParcel(const Parcel* parcel) override;
+
+private:
+    const String16 mFileName;
+    const String16 mPackageName;
+    int32_t mVersion;
+    int32_t mFlags;
+    size_t mSaltSize;
+    const uint8_t* mSalt;
+};
+
+}; // namespace android
+
+#endif // ANDROID_OBBINFO_H
\ No newline at end of file
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
index 3b9b6dd..710b503 100644
--- a/media/java/android/media/MediaFile.java
+++ b/media/java/android/media/MediaFile.java
@@ -16,115 +16,41 @@
 
 package android.media;
 
+import static android.content.ContentResolver.MIME_TYPE_DEFAULT;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.annotation.UnsupportedAppUsage;
-import android.media.DecoderCapabilities;
-import android.media.DecoderCapabilities.VideoDecoder;
-import android.media.DecoderCapabilities.AudioDecoder;
 import android.mtp.MtpConstants;
-import com.android.internal.util.Preconditions;
+
+import libcore.net.MimeUtils;
+
 import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * MediaScanner helper class.
+ * <p>
+ * This heavily relies upon extension to MIME type mappings which are maintained
+ * in {@link MimeUtils}, to ensure consistency across the OS.
+ * <p>
+ * When adding a new file type, first add the MIME type mapping to
+ * {@link MimeUtils}, and then add the MTP format mapping here.
  *
- * {@hide}
+ * @hide
  */
 public class MediaFile {
 
-    // Audio file types
-    public static final int FILE_TYPE_MP3     = 1;
-    public static final int FILE_TYPE_M4A     = 2;
-    public static final int FILE_TYPE_WAV     = 3;
-    public static final int FILE_TYPE_AMR     = 4;
-    public static final int FILE_TYPE_AWB     = 5;
-    public static final int FILE_TYPE_WMA     = 6;
-    public static final int FILE_TYPE_OGG     = 7;
-    public static final int FILE_TYPE_AAC     = 8;
-    public static final int FILE_TYPE_MKA     = 9;
-    public static final int FILE_TYPE_FLAC    = 10;
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
-    private static final int FIRST_AUDIO_FILE_TYPE = FILE_TYPE_MP3;
+    private static final int FIRST_AUDIO_FILE_TYPE = 1;
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
-    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_FLAC;
+    private static final int LAST_AUDIO_FILE_TYPE = 10;
 
-    // MIDI file types
-    public static final int FILE_TYPE_MID     = 11;
-    public static final int FILE_TYPE_SMF     = 12;
-    public static final int FILE_TYPE_IMY     = 13;
-    private static final int FIRST_MIDI_FILE_TYPE = FILE_TYPE_MID;
-    private static final int LAST_MIDI_FILE_TYPE = FILE_TYPE_IMY;
-
-    // Video file types
-    public static final int FILE_TYPE_MP4     = 21;
-    public static final int FILE_TYPE_M4V     = 22;
-    public static final int FILE_TYPE_3GPP    = 23;
-    public static final int FILE_TYPE_3GPP2   = 24;
-    public static final int FILE_TYPE_WMV     = 25;
-    public static final int FILE_TYPE_ASF     = 26;
-    public static final int FILE_TYPE_MKV     = 27;
-    public static final int FILE_TYPE_MP2TS   = 28;
-    public static final int FILE_TYPE_AVI     = 29;
-    public static final int FILE_TYPE_WEBM    = 30;
-    private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;
-    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_WEBM;
-
-    // More video file types
-    public static final int FILE_TYPE_MP2PS   = 200;
-    public static final int FILE_TYPE_QT      = 201;
-    private static final int FIRST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;
-    private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_QT;
-
-    // Image file types
-    public static final int FILE_TYPE_JPEG    = 31;
-    public static final int FILE_TYPE_GIF     = 32;
-    public static final int FILE_TYPE_PNG     = 33;
-    public static final int FILE_TYPE_BMP     = 34;
-    public static final int FILE_TYPE_WBMP    = 35;
-    public static final int FILE_TYPE_WEBP    = 36;
-    public static final int FILE_TYPE_HEIF    = 37;
-    private static final int FIRST_IMAGE_FILE_TYPE = FILE_TYPE_JPEG;
-    private static final int LAST_IMAGE_FILE_TYPE = FILE_TYPE_HEIF;
-
-    // Raw image file types
-    public static final int FILE_TYPE_DNG     = 300;
-    public static final int FILE_TYPE_CR2     = 301;
-    public static final int FILE_TYPE_NEF     = 302;
-    public static final int FILE_TYPE_NRW     = 303;
-    public static final int FILE_TYPE_ARW     = 304;
-    public static final int FILE_TYPE_RW2     = 305;
-    public static final int FILE_TYPE_ORF     = 306;
-    public static final int FILE_TYPE_RAF     = 307;
-    public static final int FILE_TYPE_PEF     = 308;
-    public static final int FILE_TYPE_SRW     = 309;
-    private static final int FIRST_RAW_IMAGE_FILE_TYPE = FILE_TYPE_DNG;
-    private static final int LAST_RAW_IMAGE_FILE_TYPE = FILE_TYPE_SRW;
-
-    // Playlist file types
-    public static final int FILE_TYPE_M3U      = 41;
-    public static final int FILE_TYPE_PLS      = 42;
-    public static final int FILE_TYPE_WPL      = 43;
-    public static final int FILE_TYPE_HTTPLIVE = 44;
-
-    private static final int FIRST_PLAYLIST_FILE_TYPE = FILE_TYPE_M3U;
-    private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_HTTPLIVE;
-
-    // Drm file types
-    public static final int FILE_TYPE_FL      = 51;
-    private static final int FIRST_DRM_FILE_TYPE = FILE_TYPE_FL;
-    private static final int LAST_DRM_FILE_TYPE = FILE_TYPE_FL;
-
-    // Other popular file types
-    public static final int FILE_TYPE_TEXT          = 100;
-    public static final int FILE_TYPE_HTML          = 101;
-    public static final int FILE_TYPE_PDF           = 102;
-    public static final int FILE_TYPE_XML           = 103;
-    public static final int FILE_TYPE_MS_WORD       = 104;
-    public static final int FILE_TYPE_MS_EXCEL      = 105;
-    public static final int FILE_TYPE_MS_POWERPOINT = 106;
-    public static final int FILE_TYPE_ZIP           = 107;
-
+    /** @deprecated file types no longer exist */
+    @Deprecated
     public static class MediaFileType {
         @UnsupportedAppUsage
         public final int fileType;
@@ -137,214 +63,178 @@
         }
     }
 
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
-    private static final HashMap<String, MediaFileType> sFileTypeMap
-            = new HashMap<String, MediaFileType>();
-    private static final HashMap<String, Integer> sMimeTypeMap
-            = new HashMap<String, Integer>();
-    // maps file extension to MTP format code
+    private static final HashMap<String, MediaFileType> sFileTypeMap = new HashMap<>();
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
-    private static final HashMap<String, Integer> sFileTypeToFormatMap
-            = new HashMap<String, Integer>();
+    private static final HashMap<String, Integer> sFileTypeToFormatMap = new HashMap<>();
+
     // maps mime type to MTP format code
     @UnsupportedAppUsage
-    private static final HashMap<String, Integer> sMimeTypeToFormatMap
-            = new HashMap<String, Integer>();
+    private static final HashMap<String, Integer> sMimeTypeToFormatMap = new HashMap<>();
     // maps MTP format code to mime type
     @UnsupportedAppUsage
-    private static final HashMap<Integer, String> sFormatToMimeTypeMap
-            = new HashMap<Integer, String>();
+    private static final HashMap<Integer, String> sFormatToMimeTypeMap = new HashMap<>();
 
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
     static void addFileType(String extension, int fileType, String mimeType) {
-        sFileTypeMap.put(extension, new MediaFileType(fileType, mimeType));
-        sMimeTypeMap.put(mimeType, Integer.valueOf(fileType));
     }
 
-    private static void addFileType(String extension, int fileType, String mimeType,
-            int mtpFormatCode, boolean primaryType) {
-        addFileType(extension, fileType, mimeType);
-        sFileTypeToFormatMap.put(extension, Integer.valueOf(mtpFormatCode));
-        sMimeTypeToFormatMap.put(mimeType, Integer.valueOf(mtpFormatCode));
-        if (primaryType) {
-            Preconditions.checkArgument(!sFormatToMimeTypeMap.containsKey(mtpFormatCode));
+    private static void addFileType(int mtpFormatCode, @NonNull String mimeType) {
+        if (!sMimeTypeToFormatMap.containsKey(mimeType)) {
+            sMimeTypeToFormatMap.put(mimeType, Integer.valueOf(mtpFormatCode));
+        }
+        if (!sFormatToMimeTypeMap.containsKey(mtpFormatCode)) {
             sFormatToMimeTypeMap.put(mtpFormatCode, mimeType);
         }
     }
 
-    private static boolean isWMAEnabled() {
-        List<AudioDecoder> decoders = DecoderCapabilities.getAudioDecoders();
-        int count = decoders.size();
-        for (int i = 0; i < count; i++) {
-            AudioDecoder decoder = decoders.get(i);
-            if (decoder == AudioDecoder.AUDIO_DECODER_WMA) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean isWMVEnabled() {
-        List<VideoDecoder> decoders = DecoderCapabilities.getVideoDecoders();
-        int count = decoders.size();
-        for (int i = 0; i < count; i++) {
-            VideoDecoder decoder = decoders.get(i);
-            if (decoder == VideoDecoder.VIDEO_DECODER_WMV) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     static {
-        addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3, true);
-        addFileType("MPGA", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3, false);
-        addFileType("M4A", FILE_TYPE_M4A, "audio/mp4", MtpConstants.FORMAT_MPEG, false);
-        addFileType("WAV", FILE_TYPE_WAV, "audio/x-wav", MtpConstants.FORMAT_WAV, true);
-        addFileType("AMR", FILE_TYPE_AMR, "audio/amr");
-        addFileType("AWB", FILE_TYPE_AWB, "audio/amr-wb");
-        if (isWMAEnabled()) {
-            addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma", MtpConstants.FORMAT_WMA, true);
-        }
-        addFileType("OGG", FILE_TYPE_OGG, "audio/ogg", MtpConstants.FORMAT_OGG, false);
-        addFileType("OGG", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG, true);
-        addFileType("OGA", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG, false);
-        addFileType("AAC", FILE_TYPE_AAC, "audio/aac", MtpConstants.FORMAT_AAC, true);
-        addFileType("AAC", FILE_TYPE_AAC, "audio/aac-adts", MtpConstants.FORMAT_AAC, false);
-        addFileType("MKA", FILE_TYPE_MKA, "audio/x-matroska");
+        addFileType(MtpConstants.FORMAT_MP3, "audio/mpeg");
+        addFileType(MtpConstants.FORMAT_WAV, "audio/x-wav");
+        addFileType(MtpConstants.FORMAT_WMA, "audio/x-ms-wma");
+        addFileType(MtpConstants.FORMAT_OGG, "audio/ogg");
+        addFileType(MtpConstants.FORMAT_AAC, "audio/aac");
+        addFileType(MtpConstants.FORMAT_FLAC, "audio/flac");
+        addFileType(MtpConstants.FORMAT_AIFF, "audio/x-aiff");
+        addFileType(MtpConstants.FORMAT_MP2, "audio/mpeg");
 
-        addFileType("MID", FILE_TYPE_MID, "audio/midi");
-        addFileType("MIDI", FILE_TYPE_MID, "audio/midi");
-        addFileType("XMF", FILE_TYPE_MID, "audio/midi");
-        addFileType("RTTTL", FILE_TYPE_MID, "audio/midi");
-        addFileType("SMF", FILE_TYPE_SMF, "audio/sp-midi");
-        addFileType("IMY", FILE_TYPE_IMY, "audio/imelody");
-        addFileType("RTX", FILE_TYPE_MID, "audio/midi");
-        addFileType("OTA", FILE_TYPE_MID, "audio/midi");
-        addFileType("MXMF", FILE_TYPE_MID, "audio/midi");
+        addFileType(MtpConstants.FORMAT_MPEG, "video/mpeg");
+        addFileType(MtpConstants.FORMAT_MP4_CONTAINER, "video/mp4");
+        addFileType(MtpConstants.FORMAT_3GP_CONTAINER, "video/3gpp");
+        addFileType(MtpConstants.FORMAT_3GP_CONTAINER, "video/3gpp2");
+        addFileType(MtpConstants.FORMAT_AVI, "video/avi");
+        addFileType(MtpConstants.FORMAT_WMV, "video/x-ms-wmv");
+        addFileType(MtpConstants.FORMAT_ASF, "video/x-ms-asf");
 
-        addFileType("MPEG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG, true);
-        addFileType("MPG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG, false);
-        addFileType("MP4", FILE_TYPE_MP4, "video/mp4", MtpConstants.FORMAT_MPEG, false);
-        addFileType("M4V", FILE_TYPE_M4V, "video/mp4", MtpConstants.FORMAT_MPEG, false);
-        addFileType("MOV", FILE_TYPE_QT, "video/quicktime", MtpConstants.FORMAT_MPEG, false);
+        addFileType(MtpConstants.FORMAT_EXIF_JPEG, "image/jpeg");
+        addFileType(MtpConstants.FORMAT_GIF, "image/gif");
+        addFileType(MtpConstants.FORMAT_PNG, "image/png");
+        addFileType(MtpConstants.FORMAT_BMP, "image/x-ms-bmp");
+        addFileType(MtpConstants.FORMAT_HEIF, "image/heif");
+        addFileType(MtpConstants.FORMAT_DNG, "image/x-adobe-dng");
+        addFileType(MtpConstants.FORMAT_TIFF, "image/tiff");
+        addFileType(MtpConstants.FORMAT_TIFF, "image/x-canon-cr2");
+        addFileType(MtpConstants.FORMAT_TIFF, "image/x-nikon-nrw");
+        addFileType(MtpConstants.FORMAT_TIFF, "image/x-sony-arw");
+        addFileType(MtpConstants.FORMAT_TIFF, "image/x-panasonic-rw2");
+        addFileType(MtpConstants.FORMAT_TIFF, "image/x-olympus-orf");
+        addFileType(MtpConstants.FORMAT_TIFF, "image/x-pentax-pef");
+        addFileType(MtpConstants.FORMAT_TIFF, "image/x-samsung-srw");
+        addFileType(MtpConstants.FORMAT_TIFF_EP, "image/tiff");
+        addFileType(MtpConstants.FORMAT_TIFF_EP, "image/x-nikon-nef");
+        addFileType(MtpConstants.FORMAT_JP2, "image/jp2");
+        addFileType(MtpConstants.FORMAT_JPX, "image/jpx");
 
-        addFileType("3GP", FILE_TYPE_3GPP, "video/3gpp",  MtpConstants.FORMAT_3GP_CONTAINER, true);
-        addFileType("3GPP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER, false);
-        addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER, false);
-        addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER, false);
-        addFileType("MKV", FILE_TYPE_MKV, "video/x-matroska");
-        addFileType("WEBM", FILE_TYPE_WEBM, "video/webm");
-        addFileType("TS", FILE_TYPE_MP2TS, "video/mp2ts");
-        addFileType("AVI", FILE_TYPE_AVI, "video/avi");
+        addFileType(MtpConstants.FORMAT_M3U_PLAYLIST, "audio/x-mpegurl");
+        addFileType(MtpConstants.FORMAT_PLS_PLAYLIST, "audio/x-scpls");
+        addFileType(MtpConstants.FORMAT_WPL_PLAYLIST, "application/vnd.ms-wpl");
+        addFileType(MtpConstants.FORMAT_ASX_PLAYLIST, "video/x-ms-asf");
 
-        if (isWMVEnabled()) {
-            addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv", MtpConstants.FORMAT_WMV, true);
-            addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf");
-        }
+        addFileType(MtpConstants.FORMAT_TEXT, "text/plain");
+        addFileType(MtpConstants.FORMAT_HTML, "text/html");
+        addFileType(MtpConstants.FORMAT_XML_DOCUMENT, "text/xml");
 
-        addFileType("JPG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG, true);
-        addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG, false);
-        addFileType("GIF", FILE_TYPE_GIF, "image/gif", MtpConstants.FORMAT_GIF, true);
-        addFileType("PNG", FILE_TYPE_PNG, "image/png", MtpConstants.FORMAT_PNG, true);
-        addFileType("BMP", FILE_TYPE_BMP, "image/x-ms-bmp", MtpConstants.FORMAT_BMP, true);
-        addFileType("WBMP", FILE_TYPE_WBMP, "image/vnd.wap.wbmp", MtpConstants.FORMAT_DEFINED, false);
-        addFileType("WEBP", FILE_TYPE_WEBP, "image/webp", MtpConstants.FORMAT_DEFINED, false);
-        addFileType("HEIC", FILE_TYPE_HEIF, "image/heif", MtpConstants.FORMAT_HEIF, true);
-        addFileType("HEIF", FILE_TYPE_HEIF, "image/heif", MtpConstants.FORMAT_HEIF, false);
-
-        addFileType("DNG", FILE_TYPE_DNG, "image/x-adobe-dng", MtpConstants.FORMAT_DNG, true);
-        addFileType("CR2", FILE_TYPE_CR2, "image/x-canon-cr2", MtpConstants.FORMAT_TIFF, false);
-        addFileType("NEF", FILE_TYPE_NEF, "image/x-nikon-nef", MtpConstants.FORMAT_TIFF_EP, false);
-        addFileType("NRW", FILE_TYPE_NRW, "image/x-nikon-nrw", MtpConstants.FORMAT_TIFF, false);
-        addFileType("ARW", FILE_TYPE_ARW, "image/x-sony-arw", MtpConstants.FORMAT_TIFF, false);
-        addFileType("RW2", FILE_TYPE_RW2, "image/x-panasonic-rw2", MtpConstants.FORMAT_TIFF, false);
-        addFileType("ORF", FILE_TYPE_ORF, "image/x-olympus-orf", MtpConstants.FORMAT_TIFF, false);
-        addFileType("RAF", FILE_TYPE_RAF, "image/x-fuji-raf", MtpConstants.FORMAT_DEFINED, false);
-        addFileType("PEF", FILE_TYPE_PEF, "image/x-pentax-pef", MtpConstants.FORMAT_TIFF, false);
-        addFileType("SRW", FILE_TYPE_SRW, "image/x-samsung-srw", MtpConstants.FORMAT_TIFF, false);
-
-        addFileType("M3U", FILE_TYPE_M3U, "audio/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST, true);
-        addFileType("M3U", FILE_TYPE_M3U, "application/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST, false);
-        addFileType("PLS", FILE_TYPE_PLS, "audio/x-scpls", MtpConstants.FORMAT_PLS_PLAYLIST, true);
-        addFileType("WPL", FILE_TYPE_WPL, "application/vnd.ms-wpl", MtpConstants.FORMAT_WPL_PLAYLIST, true);
-        addFileType("M3U8", FILE_TYPE_HTTPLIVE, "application/vnd.apple.mpegurl");
-        addFileType("M3U8", FILE_TYPE_HTTPLIVE, "audio/mpegurl");
-        addFileType("M3U8", FILE_TYPE_HTTPLIVE, "audio/x-mpegurl");
-
-        addFileType("FL", FILE_TYPE_FL, "application/x-android-drm-fl");
-
-        addFileType("TXT", FILE_TYPE_TEXT, "text/plain", MtpConstants.FORMAT_TEXT, true);
-        addFileType("HTM", FILE_TYPE_HTML, "text/html", MtpConstants.FORMAT_HTML, true);
-        addFileType("HTML", FILE_TYPE_HTML, "text/html", MtpConstants.FORMAT_HTML, false);
-        addFileType("PDF", FILE_TYPE_PDF, "application/pdf");
-        addFileType("DOC", FILE_TYPE_MS_WORD, "application/msword", MtpConstants.FORMAT_MS_WORD_DOCUMENT, true);
-        addFileType("XLS", FILE_TYPE_MS_EXCEL, "application/vnd.ms-excel", MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET, true);
-        addFileType("PPT", FILE_TYPE_MS_POWERPOINT, "application/vnd.ms-powerpoint", MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION, true);
-        addFileType("FLAC", FILE_TYPE_FLAC, "audio/flac", MtpConstants.FORMAT_FLAC, true);
-        addFileType("ZIP", FILE_TYPE_ZIP, "application/zip");
-        addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p");
-        addFileType("MPEG", FILE_TYPE_MP2PS, "video/mp2p");
+        addFileType(MtpConstants.FORMAT_MS_WORD_DOCUMENT,
+                "application/msword");
+        addFileType(MtpConstants.FORMAT_MS_WORD_DOCUMENT,
+                "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+        addFileType(MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET,
+                "application/vnd.ms-excel");
+        addFileType(MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET,
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        addFileType(MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION,
+                "application/vnd.ms-powerpoint");
+        addFileType(MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION,
+                "application/vnd.openxmlformats-officedocument.presentationml.presentation");
     }
 
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
     public static boolean isAudioFileType(int fileType) {
-        return ((fileType >= FIRST_AUDIO_FILE_TYPE &&
-                fileType <= LAST_AUDIO_FILE_TYPE) ||
-                (fileType >= FIRST_MIDI_FILE_TYPE &&
-                fileType <= LAST_MIDI_FILE_TYPE));
+        return false;
     }
 
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
     public static boolean isVideoFileType(int fileType) {
-        return (fileType >= FIRST_VIDEO_FILE_TYPE &&
-                fileType <= LAST_VIDEO_FILE_TYPE)
-            || (fileType >= FIRST_VIDEO_FILE_TYPE2 &&
-                fileType <= LAST_VIDEO_FILE_TYPE2);
+        return false;
     }
 
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
     public static boolean isImageFileType(int fileType) {
-        return (fileType >= FIRST_IMAGE_FILE_TYPE &&
-                fileType <= LAST_IMAGE_FILE_TYPE)
-            || (fileType >= FIRST_RAW_IMAGE_FILE_TYPE &&
-                fileType <= LAST_RAW_IMAGE_FILE_TYPE);
+        return false;
     }
 
-    public static boolean isRawImageFileType(int fileType) {
-        return (fileType >= FIRST_RAW_IMAGE_FILE_TYPE &&
-                fileType <= LAST_RAW_IMAGE_FILE_TYPE);
-    }
-
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
     public static boolean isPlayListFileType(int fileType) {
-        return (fileType >= FIRST_PLAYLIST_FILE_TYPE &&
-                fileType <= LAST_PLAYLIST_FILE_TYPE);
+        return false;
     }
 
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
     public static boolean isDrmFileType(int fileType) {
-        return (fileType >= FIRST_DRM_FILE_TYPE &&
-                fileType <= LAST_DRM_FILE_TYPE);
+        return false;
     }
 
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
     public static MediaFileType getFileType(String path) {
-        int lastDot = path.lastIndexOf('.');
-        if (lastDot < 0)
-            return null;
-        return sFileTypeMap.get(path.substring(lastDot + 1).toUpperCase(Locale.ROOT));
+        return null;
     }
 
-    public static boolean isMimeTypeMedia(String mimeType) {
-        int fileType = getFileTypeForMimeType(mimeType);
-        return isAudioFileType(fileType) || isVideoFileType(fileType)
-                || isImageFileType(fileType) || isPlayListFileType(fileType);
+    public static boolean isExifMimeType(@Nullable String mimeType) {
+        // For simplicity, assume that all image files might have EXIF data
+        return isImageMimeType(mimeType);
+    }
+
+    public static boolean isAudioMimeType(@Nullable String mimeType) {
+        return normalizeMimeType(mimeType).startsWith("audio/");
+    }
+
+    public static boolean isVideoMimeType(@Nullable String mimeType) {
+        return normalizeMimeType(mimeType).startsWith("video/");
+    }
+
+    public static boolean isImageMimeType(@Nullable String mimeType) {
+        return normalizeMimeType(mimeType).startsWith("image/");
+    }
+
+    public static boolean isPlayListMimeType(@Nullable String mimeType) {
+        switch (normalizeMimeType(mimeType)) {
+            case "application/vnd.ms-wpl":
+            case "audio/x-mpegurl":
+            case "audio/mpegurl":
+            case "application/x-mpegurl":
+            case "application/vnd.apple.mpegurl":
+            case "video/x-ms-asf":
+            case "audio/x-scpls":
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public static boolean isDrmMimeType(@Nullable String mimeType) {
+        return normalizeMimeType(mimeType).equals("application/x-android-drm-fl");
     }
 
     // generates a title based on file name
     @UnsupportedAppUsage
-    public static String getFileTitle(String path) {
+    public static @NonNull String getFileTitle(@NonNull String path) {
         // extract file name after last slash
         int lastSlash = path.lastIndexOf('/');
         if (lastSlash >= 0) {
@@ -361,37 +251,111 @@
         return path;
     }
 
+    public static @Nullable String getFileExtension(@Nullable String path) {
+        if (path == null) {
+            return null;
+        }
+        int lastDot = path.lastIndexOf('.');
+        if (lastDot >= 0) {
+            return path.substring(lastDot + 1);
+        } else {
+            return null;
+        }
+    }
+
+    /** @deprecated file types no longer exist */
+    @Deprecated
     @UnsupportedAppUsage
     public static int getFileTypeForMimeType(String mimeType) {
-        Integer value = sMimeTypeMap.get(mimeType);
-        return (value == null ? 0 : value.intValue());
+        return 0;
+    }
+
+    /**
+     * Find the best MIME type for the given item. Prefers mappings from file
+     * extensions, since they're more accurate than format codes.
+     */
+    public static @NonNull String getMimeType(@Nullable String path, int formatCode) {
+        // First look for extension mapping
+        String mimeType = getMimeTypeForFile(path);
+        if (!MIME_TYPE_DEFAULT.equals(mimeType)) {
+            return mimeType;
+        }
+
+        // Otherwise look for format mapping
+        return getMimeTypeForFormatCode(formatCode);
     }
 
     @UnsupportedAppUsage
-    public static String getMimeTypeForFile(String path) {
-        MediaFileType mediaFileType = getFileType(path);
-        return (mediaFileType == null ? null : mediaFileType.mimeType);
+    public static @NonNull String getMimeTypeForFile(@Nullable String path) {
+        final String mimeType = MimeUtils.guessMimeTypeFromExtension(getFileExtension(path));
+        return (mimeType != null) ? mimeType : MIME_TYPE_DEFAULT;
     }
 
-    public static int getFormatCode(String fileName, String mimeType) {
-        if (mimeType != null) {
-            Integer value = sMimeTypeToFormatMap.get(mimeType);
-            if (value != null) {
-                return value.intValue();
-            }
-        }
-        int lastDot = fileName.lastIndexOf('.');
-        if (lastDot > 0) {
-            String extension = fileName.substring(lastDot + 1).toUpperCase(Locale.ROOT);
-            Integer value = sFileTypeToFormatMap.get(extension);
-            if (value != null) {
-                return value.intValue();
-            }
-        }
-        return MtpConstants.FORMAT_UNDEFINED;
+    public static @NonNull String getMimeTypeForFormatCode(int formatCode) {
+        final String mimeType = sFormatToMimeTypeMap.get(formatCode);
+        return (mimeType != null) ? mimeType : MIME_TYPE_DEFAULT;
     }
 
-    public static String getMimeTypeForFormatCode(int formatCode) {
-        return sFormatToMimeTypeMap.get(formatCode);
+    /**
+     * Find the best MTP format code mapping for the given item. Prefers
+     * mappings from MIME types, since they're more accurate than file
+     * extensions.
+     */
+    public static int getFormatCode(@Nullable String path, @Nullable String mimeType) {
+        // First look for MIME type mapping
+        int formatCode = getFormatCodeForMimeType(mimeType);
+        if (formatCode != MtpConstants.FORMAT_UNDEFINED) {
+            return formatCode;
+        }
+
+        // Otherwise look for extension mapping
+        return getFormatCodeForFile(path);
+    }
+
+    public static int getFormatCodeForFile(@Nullable String path) {
+        return getFormatCodeForMimeType(getMimeTypeForFile(path));
+    }
+
+    public static int getFormatCodeForMimeType(@Nullable String mimeType) {
+        if (mimeType == null) {
+            return MtpConstants.FORMAT_UNDEFINED;
+        }
+
+        // First look for direct mapping
+        Integer value = sMimeTypeToFormatMap.get(mimeType);
+        if (value != null) {
+            return value.intValue();
+        }
+
+        // Otherwise look for indirect mapping
+        mimeType = normalizeMimeType(mimeType);
+        value = sMimeTypeToFormatMap.get(mimeType);
+        if (value != null) {
+            return value.intValue();
+        } else if (mimeType.startsWith("audio/")) {
+            return MtpConstants.FORMAT_UNDEFINED_AUDIO;
+        } else if (mimeType.startsWith("video/")) {
+            return MtpConstants.FORMAT_UNDEFINED_VIDEO;
+        } else if (mimeType.startsWith("image/")) {
+            return MtpConstants.FORMAT_DEFINED;
+        } else {
+            return MtpConstants.FORMAT_UNDEFINED;
+        }
+    }
+
+    /**
+     * Normalize the given MIME type by bouncing through a default file
+     * extension, if defined. This handles cases like "application/x-flac" to
+     * ".flac" to "audio/flac".
+     */
+    private static @NonNull String normalizeMimeType(@Nullable String mimeType) {
+        final String extension = MimeUtils.guessExtensionFromMimeType(mimeType);
+        if (extension != null) {
+            final String extensionMimeType = MimeUtils.guessMimeTypeFromExtension(extension);
+            if ( extensionMimeType != null) {
+                return extensionMimeType;
+            }
+        }
+        return (mimeType != null) ? mimeType : MIME_TYPE_DEFAULT;
     }
 }
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index dcacb92..0ff2d8f 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -502,6 +502,8 @@
         private String mGenre;
         @UnsupportedAppUsage
         private String mMimeType;
+        /** @deprecated file types no longer exist */
+        @Deprecated
         @UnsupportedAppUsage
         private int mFileType;
         private int mTrack;
@@ -531,7 +533,6 @@
         public FileEntry beginFile(String path, String mimeType, long lastModified,
                 long fileSize, boolean isDirectory, boolean noMedia) {
             mMimeType = mimeType;
-            mFileType = 0;
             mFileSize = fileSize;
             mIsDrm = false;
             mScanSuccess = true;
@@ -542,24 +543,13 @@
                 }
                 mNoMedia = noMedia;
 
-                // try mimeType first, if it is specified
-                if (mimeType != null) {
-                    mFileType = MediaFile.getFileTypeForMimeType(mimeType);
-                }
-
                 // if mimeType was not specified, compute file type based on file extension.
-                if (mFileType == 0) {
-                    MediaFile.MediaFileType mediaFileType = MediaFile.getFileType(path);
-                    if (mediaFileType != null) {
-                        mFileType = mediaFileType.fileType;
-                        if (mMimeType == null) {
-                            mMimeType = mediaFileType.mimeType;
-                        }
-                    }
+                if (mMimeType == null) {
+                    mMimeType = MediaFile.getMimeTypeForFile(path);
                 }
 
-                if (isDrmEnabled() && MediaFile.isDrmFileType(mFileType)) {
-                    mFileType = getFileTypeFromDrm(path);
+                if (isDrmEnabled() && MediaFile.isDrmMimeType(mMimeType)) {
+                    getMimeTypeFromDrm(path);
                 }
             }
 
@@ -578,7 +568,7 @@
                 entry.mLastModifiedChanged = true;
             }
 
-            if (mProcessPlaylists && MediaFile.isPlayListFileType(mFileType)) {
+            if (mProcessPlaylists && MediaFile.isPlayListMimeType(mMimeType)) {
                 mPlayLists.add(entry);
                 // we don't process playlists in the main scan, so return null
                 return null;
@@ -659,9 +649,9 @@
                     if (noMedia) {
                         result = endFile(entry, false, false, false, false, false);
                     } else {
-                        boolean isaudio = MediaFile.isAudioFileType(mFileType);
-                        boolean isvideo = MediaFile.isVideoFileType(mFileType);
-                        boolean isimage = MediaFile.isImageFileType(mFileType);
+                        boolean isaudio = MediaFile.isAudioMimeType(mMimeType);
+                        boolean isvideo = MediaFile.isVideoMimeType(mMimeType);
+                        boolean isimage = MediaFile.isImageMimeType(mMimeType);
 
                         if (isaudio || isvideo || isimage) {
                             path = Environment.maybeTranslateEmulatedPathToInternal(new File(path))
@@ -878,7 +868,6 @@
                 return;
             }
             mMimeType = mimeType;
-            mFileType = MediaFile.getFileTypeForMimeType(mimeType);
         }
 
         /**
@@ -906,7 +895,7 @@
             }
 
             if (!mNoMedia) {
-                if (MediaFile.isVideoFileType(mFileType)) {
+                if (MediaFile.isVideoMimeType(mMimeType)) {
                     map.put(Video.Media.ARTIST, (mArtist != null && mArtist.length() > 0
                             ? mArtist : MediaStore.UNKNOWN_STRING));
                     map.put(Video.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0
@@ -918,9 +907,9 @@
                     if (mDate > 0) {
                         map.put(Video.Media.DATE_TAKEN, mDate);
                     }
-                } else if (MediaFile.isImageFileType(mFileType)) {
+                } else if (MediaFile.isImageMimeType(mMimeType)) {
                     // FIXME - add DESCRIPTION
-                } else if (mScanSuccess && MediaFile.isAudioFileType(mFileType)) {
+                } else if (mScanSuccess && MediaFile.isAudioMimeType(mMimeType)) {
                     map.put(Audio.Media.ARTIST, (mArtist != null && mArtist.length() > 0) ?
                             mArtist : MediaStore.UNKNOWN_STRING);
                     map.put(Audio.Media.ALBUM_ARTIST, (mAlbumArtist != null &&
@@ -982,7 +971,7 @@
                 }
             }
             long rowId = entry.mRowId;
-            if (MediaFile.isAudioFileType(mFileType) && (rowId == 0 || mMtpObjectHandle != 0)) {
+            if (MediaFile.isAudioMimeType(mMimeType) && (rowId == 0 || mMtpObjectHandle != 0)) {
                 // Only set these for new entries. For existing entries, they
                 // may have been modified later, and we want to keep the current
                 // values so that custom ringtones still show up in the ringtone
@@ -992,9 +981,7 @@
                 values.put(Audio.Media.IS_ALARM, alarms);
                 values.put(Audio.Media.IS_MUSIC, music);
                 values.put(Audio.Media.IS_PODCAST, podcasts);
-            } else if ((mFileType == MediaFile.FILE_TYPE_JPEG
-                    || mFileType == MediaFile.FILE_TYPE_HEIF
-                    || MediaFile.isRawImageFileType(mFileType)) && !mNoMedia) {
+            } else if (MediaFile.isExifMimeType(mMimeType) && !mNoMedia) {
                 ExifInterface exif = null;
                 try {
                     exif = new ExifInterface(entry.mPath);
@@ -1050,16 +1037,16 @@
             int mediaType = FileColumns.MEDIA_TYPE_NONE;
             MediaInserter inserter = mMediaInserter;
             if (mScanSuccess && !mNoMedia) {
-                if (MediaFile.isVideoFileType(mFileType)) {
+                if (MediaFile.isVideoMimeType(mMimeType)) {
                     tableUri = mVideoUri;
                     mediaType = FileColumns.MEDIA_TYPE_VIDEO;
-                } else if (MediaFile.isImageFileType(mFileType)) {
+                } else if (MediaFile.isImageMimeType(mMimeType)) {
                     tableUri = mImagesUri;
                     mediaType = FileColumns.MEDIA_TYPE_IMAGE;
-                } else if (MediaFile.isAudioFileType(mFileType)) {
+                } else if (MediaFile.isAudioMimeType(mMimeType)) {
                     tableUri = mAudioUri;
                     mediaType = FileColumns.MEDIA_TYPE_AUDIO;
-                } else if (MediaFile.isPlayListFileType(mFileType)) {
+                } else if (MediaFile.isPlayListMimeType(mMimeType)) {
                     tableUri = mPlaylistsUri;
                     mediaType = FileColumns.MEDIA_TYPE_PLAYLIST;
                 }
@@ -1176,13 +1163,15 @@
             Settings.System.putInt(cr, settingSetIndicatorName(settingName), 1);
         }
 
+        /** @deprecated file types no longer exist */
+        @Deprecated
         @UnsupportedAppUsage
         private int getFileTypeFromDrm(String path) {
-            if (!isDrmEnabled()) {
-                return 0;
-            }
+            return 0;
+        }
 
-            int resultFileType = 0;
+        private void getMimeTypeFromDrm(String path) {
+            mMimeType = null;
 
             if (mDrmManagerClient == null) {
                 mDrmManagerClient = new DrmManagerClient(mContext);
@@ -1190,13 +1179,12 @@
 
             if (mDrmManagerClient.canHandle(path, null)) {
                 mIsDrm = true;
-                String drmMimetype = mDrmManagerClient.getOriginalMimeType(path);
-                if (drmMimetype != null) {
-                    mMimeType = drmMimetype;
-                    resultFileType = MediaFile.getFileTypeForMimeType(drmMimetype);
-                }
+                mMimeType = mDrmManagerClient.getOriginalMimeType(path);
             }
-            return resultFileType;
+
+            if (mMimeType == null) {
+                mMimeType = ContentResolver.MIME_TYPE_DEFAULT;
+            }
         }
 
     }; // end of anonymous MediaScannerClient instance
@@ -1305,10 +1293,8 @@
                                 // modified by the user.
                                 // The user can delete them in the media player instead.
                                 // instead, clear the path and lastModified fields in the row
-                                MediaFile.MediaFileType mediaFileType = MediaFile.getFileType(path);
-                                int fileType = (mediaFileType == null ? 0 : mediaFileType.fileType);
-
-                                if (!MediaFile.isPlayListFileType(fileType)) {
+                                String mimeType = MediaFile.getMimeTypeForFile(path);
+                                if (!MediaFile.isPlayListMimeType(mimeType)) {
                                     deleter.delete(rowId);
                                     if (path.toLowerCase(Locale.US).endsWith("/.nomedia")) {
                                         deleter.flush();
@@ -1556,14 +1542,13 @@
     }
 
     public void scanMtpFile(String path, int objectHandle, int format) {
-        MediaFile.MediaFileType mediaFileType = MediaFile.getFileType(path);
-        int fileType = (mediaFileType == null ? 0 : mediaFileType.fileType);
+        String mimeType = MediaFile.getMimeType(path, format);
         File file = new File(path);
         long lastModifiedSeconds = file.lastModified() / 1000;
 
-        if (!MediaFile.isAudioFileType(fileType) && !MediaFile.isVideoFileType(fileType) &&
-            !MediaFile.isImageFileType(fileType) && !MediaFile.isPlayListFileType(fileType) &&
-            !MediaFile.isDrmFileType(fileType)) {
+        if (!MediaFile.isAudioMimeType(mimeType) && !MediaFile.isVideoMimeType(mimeType) &&
+            !MediaFile.isImageMimeType(mimeType) && !MediaFile.isPlayListMimeType(mimeType) &&
+            !MediaFile.isDrmMimeType(mimeType)) {
 
             // no need to use the media scanner, but we need to update last modified and file size
             ContentValues values = new ContentValues();
@@ -1582,7 +1567,7 @@
         mMtpObjectHandle = objectHandle;
         Cursor fileList = null;
         try {
-            if (MediaFile.isPlayListFileType(fileType)) {
+            if (MediaFile.isPlayListMimeType(mimeType)) {
                 // build file cache so we can look up tracks in the playlist
                 prescan(null, true);
 
@@ -1597,7 +1582,7 @@
                 prescan(path, false);
 
                 // always scan the file, so we can return the content://media Uri for existing files
-                mClient.doScanFile(path, mediaFileType.mimeType, lastModifiedSeconds, file.length(),
+                mClient.doScanFile(path, mimeType, lastModifiedSeconds, file.length(),
                     (format == MtpConstants.FORMAT_ASSOCIATION), true, isNoMediaPath(path));
             }
         } catch (RemoteException e) {
@@ -1911,15 +1896,17 @@
         }
 
         String playListDirectory = path.substring(0, lastSlash + 1);
-        MediaFile.MediaFileType mediaFileType = MediaFile.getFileType(path);
-        int fileType = (mediaFileType == null ? 0 : mediaFileType.fileType);
-
-        if (fileType == MediaFile.FILE_TYPE_M3U) {
-            processM3uPlayList(path, playListDirectory, membersUri, values, fileList);
-        } else if (fileType == MediaFile.FILE_TYPE_PLS) {
-            processPlsPlayList(path, playListDirectory, membersUri, values, fileList);
-        } else if (fileType == MediaFile.FILE_TYPE_WPL) {
-            processWplPlayList(path, playListDirectory, membersUri, values, fileList);
+        String mimeType = MediaFile.getMimeTypeForFile(path);
+        switch (mimeType) {
+            case "application/vnd.ms-wpl":
+                processWplPlayList(path, playListDirectory, membersUri, values, fileList);
+                break;
+            case "audio/x-mpegurl":
+                processM3uPlayList(path, playListDirectory, membersUri, values, fileList);
+                break;
+            case "audio/x-scpls":
+                processPlsPlayList(path, playListDirectory, membersUri, values, fileList);
+                break;
         }
     }
 
diff --git a/media/java/android/media/ThumbnailUtils.java b/media/java/android/media/ThumbnailUtils.java
index 07ab069..4cc86fd 100644
--- a/media/java/android/media/ThumbnailUtils.java
+++ b/media/java/android/media/ThumbnailUtils.java
@@ -23,15 +23,13 @@
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Rect;
-import android.media.MediaMetadataRetriever;
-import android.media.MediaFile.MediaFileType;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore.Images;
 import android.util.Log;
 
-import java.io.FileInputStream;
 import java.io.FileDescriptor;
+import java.io.FileInputStream;
 import java.io.IOException;
 
 /**
@@ -94,15 +92,15 @@
                 : MAX_NUM_PIXELS_MICRO_THUMBNAIL;
         SizedThumbnailBitmap sizedThumbnailBitmap = new SizedThumbnailBitmap();
         Bitmap bitmap = null;
-        MediaFileType fileType = MediaFile.getFileType(filePath);
-        if (fileType != null) {
-            if (fileType.fileType == MediaFile.FILE_TYPE_JPEG
-                    || MediaFile.isRawImageFileType(fileType.fileType)) {
-                createThumbnailFromEXIF(filePath, targetSize, maxPixels, sizedThumbnailBitmap);
-                bitmap = sizedThumbnailBitmap.mBitmap;
-            } else if (fileType.fileType == MediaFile.FILE_TYPE_HEIF) {
-                bitmap = createThumbnailFromMetadataRetriever(filePath, targetSize, maxPixels);
-            }
+        String mimeType = MediaFile.getMimeTypeForFile(filePath);
+        if (mimeType.equals("image/heif")
+                || mimeType.equals("image/heif-sequence")
+                || mimeType.equals("image/heic")
+                || mimeType.equals("image/heic-sequence")) {
+            bitmap = createThumbnailFromMetadataRetriever(filePath, targetSize, maxPixels);
+        } else if (MediaFile.isExifMimeType(mimeType)) {
+            createThumbnailFromEXIF(filePath, targetSize, maxPixels, sizedThumbnailBitmap);
+            bitmap = sizedThumbnailBitmap.mBitmap;
         }
 
         if (bitmap == null) {
diff --git a/media/java/android/mtp/OWNERS b/media/java/android/mtp/OWNERS
new file mode 100644
index 0000000..1928ba8
--- /dev/null
+++ b/media/java/android/mtp/OWNERS
@@ -0,0 +1,7 @@
+set noparent
+
+marcone@google.com
+jsharkey@android.com
+jameswei@google.com
+rmojumder@google.com
+
diff --git a/media/tests/MediaFrameworkTest/AndroidTest.xml b/media/tests/MediaFrameworkTest/AndroidTest.xml
new file mode 100644
index 0000000..204959f
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/AndroidTest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Runs Media Framework Tests">
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="mediaframeworktest.apk" />
+    </target_preparer>
+
+    <option name="test-tag" value="MediaFrameworkTest" />
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="com.android.mediaframeworktest" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="hidden-api-checks" value="false"/>
+    </test>
+</configuration>
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java
new file mode 100644
index 0000000..feac63d
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mediaframeworktest.unit;
+
+import static android.media.MediaFile.getFormatCode;
+import static android.media.MediaFile.getMimeType;
+import static android.media.MediaFile.isAudioMimeType;
+import static android.media.MediaFile.isImageMimeType;
+import static android.media.MediaFile.isPlayListMimeType;
+import static android.media.MediaFile.isVideoMimeType;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.mtp.MtpConstants;
+import android.support.test.runner.AndroidJUnit4;
+
+import libcore.net.MimeUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class MediaFileTest {
+    @Test
+    public void testCommon() throws Exception {
+        assertConsistent("FOO.TXT", "text/plain", MtpConstants.FORMAT_TEXT);
+        assertConsistent("FOO.XML", "text/xml", MtpConstants.FORMAT_XML_DOCUMENT);
+        assertConsistent("FOO.HTML", "text/html", MtpConstants.FORMAT_HTML);
+    }
+
+    @Test
+    public void testAudio() throws Exception {
+        assertTrue(isAudioMimeType("audio/flac"));
+        assertTrue(isAudioMimeType("application/x-flac"));
+        assertFalse(isAudioMimeType("video/mpeg"));
+
+        assertConsistent("FOO.MP3", "audio/mpeg", MtpConstants.FORMAT_MP3);
+        assertConsistent("FOO.AAC", "audio/aac", MtpConstants.FORMAT_AAC);
+        assertConsistent("FOO.OGG", "audio/ogg", MtpConstants.FORMAT_OGG);
+        assertConsistent("FOO.FLAC", "audio/flac", MtpConstants.FORMAT_FLAC);
+    }
+
+    @Test
+    public void testVideo() throws Exception {
+        assertTrue(isVideoMimeType("video/x-msvideo"));
+        assertFalse(isVideoMimeType("audio/mpeg"));
+
+        assertConsistent("FOO.AVI", "video/avi", MtpConstants.FORMAT_AVI);
+        assertConsistent("FOO.MP4", "video/mp4", MtpConstants.FORMAT_MP4_CONTAINER);
+        assertConsistent("FOO.3GP", "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER);
+    }
+
+    @Test
+    public void testImage() throws Exception {
+        assertTrue(isImageMimeType("image/jpeg"));
+        assertTrue(isImageMimeType("image/heif"));
+        assertTrue(isImageMimeType("image/webp"));
+        assertFalse(isImageMimeType("video/webm"));
+
+        assertConsistent("FOO.JPG", "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);
+        assertConsistent("FOO.PNG", "image/png", MtpConstants.FORMAT_PNG);
+        assertConsistent("FOO.HEIF", "image/heif", MtpConstants.FORMAT_HEIF);
+        assertConsistent("FOO.DNG", "image/x-adobe-dng", MtpConstants.FORMAT_DNG);
+        assertConsistent("FOO.TIFF", "image/tiff", MtpConstants.FORMAT_TIFF);
+    }
+
+    @Test
+    public void testPlayList() throws Exception {
+        assertTrue(isPlayListMimeType(MimeUtils.guessMimeTypeFromExtension("pls")));
+        assertTrue(isPlayListMimeType(MimeUtils.guessMimeTypeFromExtension("wpl")));
+        assertTrue(isPlayListMimeType(MimeUtils.guessMimeTypeFromExtension("m3u")));
+        assertTrue(isPlayListMimeType(MimeUtils.guessMimeTypeFromExtension("m3u8")));
+        assertTrue(isPlayListMimeType(MimeUtils.guessMimeTypeFromExtension("asf")));
+    }
+
+    @Test
+    public void testImageRaw() throws Exception {
+        // We trust MIME types before filenames
+        assertHexEquals(MtpConstants.FORMAT_TIFF, getFormatCode("FOO.CR2", "image/x-canon-cr2"));
+        // We trust filenames before format codes
+        assertEquals("image/x-canon-cr2", getMimeType("FOO.CR2", MtpConstants.FORMAT_TIFF));
+    }
+
+    @Test
+    public void testConfusing() throws Exception {
+        // We trust MIME types before filenames
+        assertHexEquals(MtpConstants.FORMAT_MP3, getFormatCode("foo.avi", "audio/mpeg"));
+        // We trust filenames before format codes
+        assertEquals("video/avi", getMimeType("foo.avi", MtpConstants.FORMAT_MP3));
+    }
+
+    @Test
+    public void testUnknown() throws Exception {
+        assertHexEquals(MtpConstants.FORMAT_UNDEFINED,
+                getFormatCode("foo.example", "application/x-example"));
+        assertHexEquals(MtpConstants.FORMAT_UNDEFINED_AUDIO,
+                getFormatCode("foo.example", "audio/x-example"));
+        assertHexEquals(MtpConstants.FORMAT_UNDEFINED_VIDEO,
+                getFormatCode("foo.example", "video/x-example"));
+        assertHexEquals(MtpConstants.FORMAT_DEFINED,
+                getFormatCode("foo.example", "image/x-example"));
+    }
+
+    private static void assertConsistent(String path, String mimeType, int formatCode) {
+        assertHexEquals(formatCode, getFormatCode(path, null));
+        assertHexEquals(formatCode, getFormatCode(null, mimeType));
+        assertHexEquals(formatCode, getFormatCode(path, mimeType));
+
+        assertEquals(mimeType, getMimeType(path, MtpConstants.FORMAT_UNDEFINED));
+        assertEquals(mimeType, getMimeType(null, formatCode));
+        assertEquals(mimeType, getMimeType(path, formatCode));
+    }
+
+    private static void assertHexEquals(int expected, int actual) {
+        assertEquals(Integer.toHexString(expected), Integer.toHexString(actual));
+    }
+}
diff --git a/native/android/OWNERS b/native/android/OWNERS
index 067cdf8..b3f50aa 100644
--- a/native/android/OWNERS
+++ b/native/android/OWNERS
@@ -1,15 +1,4 @@
 set noparent
 
-per-file libandroid_net.map.txt=codewiz@google.com
-per-file libandroid_net.map.txt=ek@google.com
-per-file libandroid_net.map.txt=jchalard@google.com
-per-file libandroid_net.map.txt=lorenzo@google.com
-per-file libandroid_net.map.txt=reminv@google.com
-per-file libandroid_net.map.txt=satk@google.com
-
-per-file net.c=codewiz@google.com
-per-file net.c=ek@google.com
-per-file net.c=jchalard@google.com
-per-file net.c=lorenzo@google.com
-per-file net.c=reminv@google.com
-per-file net.c=satk@google.com
+per-file libandroid_net.map.txt, net.c = codewiz@google.com, ek@google.com, jchalard@google.com
+per-file libandroid_net.map.txt, net.c = lorenzo@google.com, reminv@google.com, satk@google.com
diff --git a/native/android/storage_manager.cpp b/native/android/storage_manager.cpp
index bf15b8d..2272525 100644
--- a/native/android/storage_manager.cpp
+++ b/native/android/storage_manager.cpp
@@ -18,7 +18,9 @@
 
 #include <android/storage_manager.h>
 #include <storage/IMountService.h>
+#include <storage/ObbInfo.h>
 
+#include <androidfw/ObbFile.h>
 #include <binder/Binder.h>
 #include <binder/IServiceManager.h>
 #include <cutils/atomic.h>
@@ -29,7 +31,6 @@
 #include <utils/Vector.h>
 #include <utils/threads.h>
 
-
 using namespace android;
 
 struct ObbActionListener : public BnObbActionListener {
@@ -79,6 +80,20 @@
         return cb;
     }
 
+    ObbInfo* getObbInfo(char* canonicalPath) {
+        sp<ObbFile> obbFile = new ObbFile();
+        if (!obbFile->readFrom(canonicalPath)) {
+            return nullptr;
+        }
+
+        String16 fileName(obbFile->getFileName());
+        String16 packageName(obbFile->getPackageName());
+        size_t length;
+        const unsigned char* salt = obbFile->getSalt(&length);
+        return new ObbInfo(fileName, packageName,
+                obbFile->getVersion(), obbFile->getFlags(), length, salt);
+    }
+
 public:
     AStorageManager()
     {
@@ -134,11 +149,18 @@
             return;
         }
 
+        sp<ObbInfo> obbInfo = getObbInfo(canonicalPath);
+        if (obbInfo == nullptr) {
+            ALOGE("Couldn't get obb info for %s: %s", canonicalPath, strerror(errno));
+            return;
+        }
+
         ObbCallback* cb = registerObbCallback(func, data);
         String16 rawPath16(rawPath);
         String16 canonicalPath16(canonicalPath);
         String16 key16(key);
-        mMountService->mountObb(rawPath16, canonicalPath16, key16, mObbActionListener, cb->nonce);
+        mMountService->mountObb(rawPath16, canonicalPath16, key16, mObbActionListener,
+                cb->nonce, obbInfo);
     }
 
     void unmountObb(const char* filename, const bool force, AStorageManager_obbCallbackFunc func, void* data) {
diff --git a/packages/CaptivePortalLogin/Android.mk b/packages/CaptivePortalLogin/Android.mk
index 3ea3340..8c63f45 100644
--- a/packages/CaptivePortalLogin/Android.mk
+++ b/packages/CaptivePortalLogin/Android.mk
@@ -4,7 +4,6 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_USE_AAPT2 := true
 LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES := services.net
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 9f89d3c..149de13 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -33,7 +33,6 @@
 import android.net.Proxy;
 import android.net.Uri;
 import android.net.captiveportal.CaptivePortalProbeSpec;
-import android.net.dns.ResolvUtil;
 import android.net.http.SslError;
 import android.net.wifi.WifiInfo;
 import android.os.Build;
@@ -132,9 +131,9 @@
         }
 
         // Also initializes proxy system properties.
+        mNetwork = mNetwork.getPrivateDnsBypassingCopy();
         mCm.bindProcessToNetwork(mNetwork);
-        mCm.setProcessDefaultNetworkForHostResolution(
-                ResolvUtil.getNetworkWithUseLocalNameserversFlag(mNetwork));
+        mCm.setProcessDefaultNetworkForHostResolution(mNetwork);
 
         // Proxy system properties must be initialized before setContentView is called because
         // setContentView initializes the WebView logic which in turn reads the system properties.
@@ -334,7 +333,6 @@
         // TODO: reuse NetworkMonitor facilities for consistent captive portal detection.
         new Thread(new Runnable() {
             public void run() {
-                final Network network = ResolvUtil.makeNetworkWithPrivateDnsBypass(mNetwork);
                 // Give time for captive portal to open.
                 try {
                     Thread.sleep(1000);
@@ -344,7 +342,7 @@
                 int httpResponseCode = 500;
                 String locationHeader = null;
                 try {
-                    urlConnection = (HttpURLConnection) network.openConnection(mUrl);
+                    urlConnection = (HttpURLConnection) mNetwork.openConnection(mUrl);
                     urlConnection.setInstanceFollowRedirects(false);
                     urlConnection.setConnectTimeout(SOCKET_TIMEOUT_MS);
                     urlConnection.setReadTimeout(SOCKET_TIMEOUT_MS);
diff --git a/packages/CarSystemUI/Android.bp b/packages/CarSystemUI/Android.bp
index 36ef04a..f908595 100644
--- a/packages/CarSystemUI/Android.bp
+++ b/packages/CarSystemUI/Android.bp
@@ -16,6 +16,10 @@
 android_app {
     name: "CarSystemUI",
 
+    overrides: [
+        "SystemUI",
+    ],
+
     srcs: [
         "src/**/*.java",
         "src/**/I*.aidl",
diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
index 9f165bc..97a67c2 100644
--- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
+++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
@@ -16,11 +16,9 @@
 
 package com.android.defcontainer;
 
-import android.app.IntentService;
+import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageCleanItem;
 import android.content.pm.PackageInfoLite;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageParser;
@@ -29,13 +27,10 @@
 import android.content.res.ObbInfo;
 import android.content.res.ObbScanner;
 import android.os.Binder;
-import android.os.Environment.UserEnvironment;
 import android.os.FileUtils;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
-import android.os.Process;
 import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.util.Slog;
 
 import com.android.internal.app.IMediaContainerService;
@@ -57,7 +52,7 @@
  * open files that cause the kernel to kill it when the underlying device is
  * removed.
  */
-public class DefaultContainerService extends IntentService {
+public class DefaultContainerService extends Service {
     private static final String TAG = "DefContainer";
 
     // TODO: migrate native code unpacking to always be a derivative work
@@ -159,16 +154,6 @@
             }
         }
 
-        @Override
-        public void clearDirectory(String path) throws RemoteException {
-            Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
-
-            final File directory = new File(path);
-            if (directory.exists() && directory.isDirectory()) {
-                eraseFiles(directory);
-            }
-        }
-
         /**
          * Calculate estimated footprint of given package post-installation.
          *
@@ -191,49 +176,6 @@
         }
     };
 
-    public DefaultContainerService() {
-        super("DefaultContainerService");
-        setIntentRedelivery(true);
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        if (PackageManager.ACTION_CLEAN_EXTERNAL_STORAGE.equals(intent.getAction())) {
-            final IPackageManager pm = IPackageManager.Stub.asInterface(
-                    ServiceManager.getService("package"));
-            PackageCleanItem item = null;
-            try {
-                while ((item = pm.nextPackageToClean(item)) != null) {
-                    final UserEnvironment userEnv = new UserEnvironment(item.userId);
-                    eraseFiles(userEnv.buildExternalStorageAppDataDirs(item.packageName));
-                    eraseFiles(userEnv.buildExternalStorageAppMediaDirs(item.packageName));
-                    if (item.andCode) {
-                        eraseFiles(userEnv.buildExternalStorageAppObbDirs(item.packageName));
-                    }
-                }
-            } catch (RemoteException e) {
-            }
-        }
-    }
-
-    void eraseFiles(File[] paths) {
-        for (File path : paths) {
-            eraseFiles(path);
-        }
-    }
-
-    void eraseFiles(File path) {
-        if (path.isDirectory()) {
-            String[] files = path.list();
-            if (files != null) {
-                for (String file : files) {
-                    eraseFiles(new File(path, file));
-                }
-            }
-        }
-        path.delete();
-    }
-
     @Override
     public IBinder onBind(Intent intent) {
         return mBinder;
diff --git a/packages/ExtServices/AndroidManifest.xml b/packages/ExtServices/AndroidManifest.xml
index a7217ec..ff70e97 100644
--- a/packages/ExtServices/AndroidManifest.xml
+++ b/packages/ExtServices/AndroidManifest.xml
@@ -55,6 +55,12 @@
             <intent-filter>
                 <action android:name="android.service.autofill.AutofillFieldClassificationService" />
             </intent-filter>
+            <meta-data
+                android:name="android.autofill.field_classification.default_algorithm"
+                android:resource="@string/autofill_field_classification_default_algorithm" />
+            <meta-data
+                android:name="android.autofill.field_classification.available_algorithms"
+                android:resource="@array/autofill_field_classification_available_algorithms" />
         </service>
 
         <library android:name="android.ext.services"/>
diff --git a/packages/InputDevices/res/values-es/strings.xml b/packages/InputDevices/res/values-es/strings.xml
index a17f058..cde66e7 100644
--- a/packages/InputDevices/res/values-es/strings.xml
+++ b/packages/InputDevices/res/values-es/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="8016145283189546017">"Dispositivos de entrada"</string>
+    <string name="app_label" msgid="8016145283189546017">"Dispositivos de introducción de datos"</string>
     <string name="keyboard_layouts_label" msgid="6688773268302087545">"Teclado de Android"</string>
     <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Inglés (Reino Unido)"</string>
     <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"Inglés (EE.UU.)"</string>
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
index f243b51..59c205a 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
@@ -851,25 +851,7 @@
             return DocumentsContract.Document.MIME_TYPE_DIR;
         }
 
-        final String formatCodeMimeType = MediaFile.getMimeTypeForFormatCode(info.getFormat());
-        final String mediaFileMimeType = MediaFile.getMimeTypeForFile(info.getName());
-
-        // Format code can be mapped with multiple mime types, e.g. FORMAT_MPEG is mapped with
-        // audio/mp4 and video/mp4.
-        // As file extension contains more information than format code, returns mime type obtained
-        // from file extension if it is consistent with format code.
-        if (mediaFileMimeType != null &&
-                MediaFile.getFormatCode("", mediaFileMimeType) == info.getFormat()) {
-            return mediaFileMimeType;
-        }
-        if (formatCodeMimeType != null) {
-            return formatCodeMimeType;
-        }
-        if (mediaFileMimeType != null) {
-            return mediaFileMimeType;
-        }
-        // We don't know the file type.
-        return "application/octet-stream";
+        return MediaFile.getMimeType(info.getName(), info.getFormat());
     }
 
     private static int getRootFlags(int[] operationsSupported) {
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index 4791517..943dd84 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -11,6 +11,11 @@
         "androidx.lifecycle_lifecycle-runtime",
     ],
 
+    static_libs: [
+        "SettingsLibHelpUtils",
+        "SettingsLibRestrictedLockUtils",
+    ],
+
     // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
     // LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common
 
diff --git a/packages/SettingsLib/HelpUtils/Android.bp b/packages/SettingsLib/HelpUtils/Android.bp
new file mode 100644
index 0000000..af60185
--- /dev/null
+++ b/packages/SettingsLib/HelpUtils/Android.bp
@@ -0,0 +1,9 @@
+android_library {
+    name: "SettingsLibHelpUtils",
+
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+
+    sdk_version: "system_current",
+    min_sdk_version: "21",
+}
diff --git a/packages/SettingsLib/HelpUtils/AndroidManifest.xml b/packages/SettingsLib/HelpUtils/AndroidManifest.xml
new file mode 100644
index 0000000..35b3933
--- /dev/null
+++ b/packages/SettingsLib/HelpUtils/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settingslib.helputils">
+
+    <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
diff --git a/packages/SettingsLib/res/drawable/ic_help_actionbar.xml b/packages/SettingsLib/HelpUtils/res/drawable/ic_help_actionbar.xml
similarity index 100%
rename from packages/SettingsLib/res/drawable/ic_help_actionbar.xml
rename to packages/SettingsLib/HelpUtils/res/drawable/ic_help_actionbar.xml
diff --git a/packages/SettingsLib/HelpUtils/res/values/strings.xml b/packages/SettingsLib/HelpUtils/res/values/strings.xml
new file mode 100644
index 0000000..ae07f5d
--- /dev/null
+++ b/packages/SettingsLib/HelpUtils/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2018 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Label for Help and feedback menu item -->
+    <string name="help_feedback_label">Help &amp; feedback</string>
+
+</resources>
\ No newline at end of file
diff --git a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java b/packages/SettingsLib/HelpUtils/src/com/android/settingslib/HelpUtils.java
similarity index 91%
rename from packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
rename to packages/SettingsLib/HelpUtils/src/com/android/settingslib/HelpUtils.java
index 8055caa..7306d968 100644
--- a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
+++ b/packages/SettingsLib/HelpUtils/src/com/android/settingslib/HelpUtils.java
@@ -24,22 +24,20 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
-import android.content.res.Resources.Theme;
 import android.content.res.TypedArray;
 import android.net.Uri;
 import android.provider.Settings.Global;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 
 import java.net.URISyntaxException;
 import java.util.Locale;
 
+import com.android.settingslib.helputils.R;
+
 /**
  * Functions to easily prepare contextual help menu option items with an intent that opens up the
  * browser to a particular URL, while taking into account the preferred language and app version.
@@ -116,9 +114,13 @@
                 helpMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
                     @Override
                     public boolean onMenuItemClick(MenuItem item) {
+                        /**
+                         * TODO: Enable metrics logger for @SystemApi (b/111552654)
+                         *
                         MetricsLogger.action(activity,
                             MetricsEvent.ACTION_SETTING_HELP_AND_FEEDBACK,
                             intent.getStringExtra(EXTRA_CONTEXT));
+                        */
                         try {
                             activity.startActivityForResult(intent, 0);
                         } catch (ActivityNotFoundException exc) {
@@ -181,23 +183,21 @@
 
         Resources resources = context.getResources();
         boolean includePackageName =
-                resources.getBoolean(com.android.internal.R.bool.config_sendPackageName);
+                resources.getBoolean(android.R.bool.config_sendPackageName);
 
         if (sendPackageName && includePackageName) {
             String[] packageNameKey =
-                    {resources.getString(com.android.internal.R.string.config_helpPackageNameKey)};
+                    {resources.getString(android.R.string.config_help_package_name_key)};
             String[] packageNameValue =
-                    {resources.getString(
-                            com.android.internal.R.string.config_helpPackageNameValue)};
+                    {resources.getString(android.R.string.config_help_package_name_value)};
             String helpIntentExtraKey =
-                    resources.getString(com.android.internal.R.string.config_helpIntentExtraKey);
+                    resources.getString(android.R.string.config_help_intent_extra_key);
             String helpIntentNameKey =
-                    resources.getString(com.android.internal.R.string.config_helpIntentNameKey);
+                    resources.getString(android.R.string.config_help_intent_name_key);
             String feedbackIntentExtraKey =
-                    resources.getString(
-                            com.android.internal.R.string.config_feedbackIntentExtraKey);
+                    resources.getString(android.R.string.config_feedback_intent_extra_key);
             String feedbackIntentNameKey =
-                    resources.getString(com.android.internal.R.string.config_feedbackIntentNameKey);
+                    resources.getString(android.R.string.config_feedback_intent_name_key);
             intent.putExtra(helpIntentExtraKey, packageNameKey);
             intent.putExtra(helpIntentNameKey, packageNameValue);
             intent.putExtra(feedbackIntentExtraKey, packageNameKey);
diff --git a/packages/SettingsLib/RestrictedLockUtils/Android.bp b/packages/SettingsLib/RestrictedLockUtils/Android.bp
new file mode 100644
index 0000000..d4c9794
--- /dev/null
+++ b/packages/SettingsLib/RestrictedLockUtils/Android.bp
@@ -0,0 +1,12 @@
+android_library {
+    name: "SettingsLibRestrictedLockUtils",
+
+    srcs: ["src/**/*.java"],
+
+    libs: [
+        "androidx.annotation_annotation",
+    ],
+
+    sdk_version: "system_current",
+    min_sdk_version: "21",
+}
\ No newline at end of file
diff --git a/packages/SettingsLib/RestrictedLockUtils/AndroidManifest.xml b/packages/SettingsLib/RestrictedLockUtils/AndroidManifest.xml
new file mode 100644
index 0000000..d7b323a
--- /dev/null
+++ b/packages/SettingsLib/RestrictedLockUtils/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.settingslib.restrictedlockutils">
+
+    <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
\ No newline at end of file
diff --git a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java
new file mode 100644
index 0000000..738181d
--- /dev/null
+++ b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settingslib;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+/**
+ * Utility class to host methods usable in adding a restricted padlock icon and showing admin
+ * support message dialog.
+ */
+public class RestrictedLockUtils {
+    public static EnforcedAdmin getProfileOrDeviceOwner(Context context, int userId) {
+        return getProfileOrDeviceOwner(context, null, userId);
+    }
+
+    public static EnforcedAdmin getProfileOrDeviceOwner(
+            Context context, String enforcedRestriction, int userId) {
+        if (userId == UserHandle.USER_NULL) {
+            return null;
+        }
+        final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
+        if (dpm == null) {
+            return null;
+        }
+        ComponentName adminComponent = dpm.getProfileOwnerAsUser(userId);
+        if (adminComponent != null) {
+            return new EnforcedAdmin(adminComponent, enforcedRestriction, userId);
+        }
+        if (dpm.getDeviceOwnerUserId() == userId) {
+            adminComponent = dpm.getDeviceOwnerComponentOnAnyUser();
+            if (adminComponent != null) {
+                return new EnforcedAdmin(adminComponent, enforcedRestriction, userId);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Send the intent to trigger the {@code android.settings.ShowAdminSupportDetailsDialog}.
+     */
+    public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {
+        final Intent intent = getShowAdminSupportDetailsIntent(context, admin);
+        int targetUserId = UserHandle.myUserId();
+        if (admin != null && admin.userId != UserHandle.USER_NULL
+                && isCurrentUserOrProfile(context, admin.userId)) {
+            targetUserId = admin.userId;
+        }
+        intent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, admin.enforcedRestriction);
+        context.startActivityAsUser(intent, UserHandle.of(targetUserId));
+    }
+
+    public static Intent getShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {
+        final Intent intent = new Intent(Settings.ACTION_SHOW_ADMIN_SUPPORT_DETAILS);
+        if (admin != null) {
+            if (admin.component != null) {
+                intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin.component);
+            }
+            int adminUserId = UserHandle.myUserId();
+            if (admin.userId != UserHandle.USER_NULL) {
+                adminUserId = admin.userId;
+            }
+            intent.putExtra(Intent.EXTRA_USER_ID, adminUserId);
+        }
+        return intent;
+    }
+
+    public static boolean isCurrentUserOrProfile(Context context, int userId) {
+        UserManager um = context.getSystemService(UserManager.class);
+        int[] userIds = um.getProfileIds(UserHandle.myUserId(), true);
+        for (int i = 0; i < userIds.length; i++) {
+            if (userIds[i] == userId) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static class EnforcedAdmin {
+        @Nullable
+        public ComponentName component = null;
+        /**
+         * The restriction enforced by admin. It could be any user restriction or policy like
+         * {@link DevicePolicyManager#POLICY_DISABLE_CAMERA}.
+         */
+        @Nullable
+        public String enforcedRestriction = null;
+        public int userId = UserHandle.USER_NULL;
+
+        // We use this to represent the case where a policy is enforced by multiple admins.
+        public final static EnforcedAdmin MULTIPLE_ENFORCED_ADMIN = new EnforcedAdmin();
+
+        public static EnforcedAdmin createDefaultEnforcedAdminWithRestriction(
+                String enforcedRestriction) {
+            EnforcedAdmin enforcedAdmin = new EnforcedAdmin();
+            enforcedAdmin.enforcedRestriction = enforcedRestriction;
+            return enforcedAdmin;
+        }
+
+        public EnforcedAdmin(ComponentName component, int userId) {
+            this.component = component;
+            this.userId = userId;
+        }
+
+        public EnforcedAdmin(ComponentName component, String enforcedRestriction, int userId) {
+            this.component = component;
+            this.enforcedRestriction = enforcedRestriction;
+            this.userId = userId;
+        }
+
+        public EnforcedAdmin(EnforcedAdmin other) {
+            if (other == null) {
+                throw new IllegalArgumentException();
+            }
+            this.component = other.component;
+            this.enforcedRestriction = other.enforcedRestriction;
+            this.userId = other.userId;
+        }
+
+        public EnforcedAdmin() {
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            EnforcedAdmin that = (EnforcedAdmin) o;
+            return userId == that.userId &&
+                    Objects.equals(component, that.component) &&
+                    Objects.equals(enforcedRestriction, that.enforcedRestriction);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(component, enforcedRestriction, userId);
+        }
+
+        @Override
+        public String toString() {
+            return "EnforcedAdmin{" +
+                    "component=" + component +
+                    ", enforcedRestriction='" + enforcedRestriction +
+                    ", userId=" + userId +
+                    '}';
+        }
+    }
+}
diff --git a/packages/SettingsLib/res/layout/restricted_switch_preference.xml b/packages/SettingsLib/res/layout/restricted_switch_preference.xml
index 64b47b6..d9f91de 100644
--- a/packages/SettingsLib/res/layout/restricted_switch_preference.xml
+++ b/packages/SettingsLib/res/layout/restricted_switch_preference.xml
@@ -24,7 +24,7 @@
     android:clipToPadding="false">
 
     <LinearLayout
-        android:id="@+id/icon_container"
+        android:id="@+id/icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minWidth="56dp"
@@ -83,4 +83,4 @@
         android:paddingStart="16dp"
         android:orientation="vertical" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml
index 0b7ce0d..ca96070 100644
--- a/packages/SettingsLib/res/values-da/strings.xml
+++ b/packages/SettingsLib/res/values-da/strings.xml
@@ -386,8 +386,8 @@
     <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Denne tablet lukker muligvis snart ned (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string>
     <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Enheden lukker muligvis snart ned (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string>
     <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> til det er fuldt opladet"</string>
-    <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> til det er fuldt opladet"</string>
+    <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"fuldt opladet om <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – fuldt opladet om <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Ukendt"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Oplader"</string>
     <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"oplader"</string>
diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml
index fa30827..264427e 100644
--- a/packages/SettingsLib/res/values-nl/strings.xml
+++ b/packages/SettingsLib/res/values-nl/strings.xml
@@ -371,10 +371,10 @@
     <string name="power_remaining_duration_only_enhanced" msgid="4189311599812296592">"Ongeveer <xliff:g id="TIME_REMAINING">%1$s</xliff:g> resterend op basis van je gebruik"</string>
     <string name="power_discharging_duration_enhanced" msgid="1992003260664804080">"Ongeveer <xliff:g id="TIME_REMAINING">%1$s</xliff:g> resterend op basis van je gebruik (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
     <string name="power_remaining_duration_only_short" msgid="3463575350656389957">"<xliff:g id="TIME_REMAINING">%1$s</xliff:g> resterend"</string>
-    <string name="power_discharge_by_enhanced" msgid="2095821536747992464">"Is nog genoeg voor ongeveer <xliff:g id="TIME">%1$s</xliff:g> op basis van je gebruik (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
-    <string name="power_discharge_by_only_enhanced" msgid="2175151772952365149">"Is nog genoeg voor ongeveer <xliff:g id="TIME">%1$s</xliff:g> op basis van je gebruik"</string>
-    <string name="power_discharge_by" msgid="6453537733650125582">"Is nog genoeg voor ongeveer <xliff:g id="TIME">%1$s</xliff:g> (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
-    <string name="power_discharge_by_only" msgid="107616694963545745">"Is nog genoeg voor ongeveer <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="power_discharge_by_enhanced" msgid="2095821536747992464">"Is nog genoeg tot ongeveer <xliff:g id="TIME">%1$s</xliff:g> op basis van je gebruik (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
+    <string name="power_discharge_by_only_enhanced" msgid="2175151772952365149">"Is nog genoeg tot ongeveer <xliff:g id="TIME">%1$s</xliff:g> op basis van je gebruik"</string>
+    <string name="power_discharge_by" msgid="6453537733650125582">"Is nog genoeg tot ongeveer <xliff:g id="TIME">%1$s</xliff:g> (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
+    <string name="power_discharge_by_only" msgid="107616694963545745">"Is nog genoeg tot ongeveer <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="power_remaining_less_than_duration_only" msgid="5996752448813295329">"Minder dan <xliff:g id="THRESHOLD">%1$s</xliff:g> resterend"</string>
     <string name="power_remaining_less_than_duration" msgid="5751885147712659423">"Minder dan <xliff:g id="THRESHOLD">%1$s</xliff:g> resterend (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
     <string name="power_remaining_more_than_subtext" msgid="3176771815132876675">"Meer dan <xliff:g id="TIME_REMAINING">%1$s</xliff:g> resterend (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml
index c83438b..040aea6 100644
--- a/packages/SettingsLib/res/values-sv/strings.xml
+++ b/packages/SettingsLib/res/values-sv/strings.xml
@@ -306,8 +306,8 @@
     <string name="track_frame_time" msgid="6094365083096851167">"Profilens HWUI-rendering"</string>
     <string name="enable_gpu_debug_layers" msgid="3848838293793255097">"Aktivera GPU-felsökningslager"</string>
     <string name="enable_gpu_debug_layers_summary" msgid="8009136940671194940">"Tillåt att felsökningsappar läser in GPU-felsökningslager"</string>
-    <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala, fönsteranimering"</string>
-    <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala, övergångsanimering"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala – fönsteranimering"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala – övergångsanimering"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Längdskala för Animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulera sekundär skärm"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Appar"</string>
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 6bc07c2..ea6844e 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -1028,8 +1028,6 @@
     <!-- Description for a custom screen zoom level. This shows the requested display
          density in raw pixels per inch rather than using a relative description. [CHAR LIMIT=24] -->
     <string name="screen_zoom_summary_custom">Custom (<xliff:g id="densityDpi" example="160">%d</xliff:g>)</string>
-    <!-- Label for Help and feedback menu item -->
-    <string name="help_feedback_label">Help &amp; feedback</string>
 
     <!-- Content description for drawer menu button [CHAR_LIMIT=30]-->
     <string name="content_description_menu_button">Menu</string>
diff --git a/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java b/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java
index cf1c2c3..3bade25 100644
--- a/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java
@@ -20,11 +20,12 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.preference.PreferenceDialogFragment;
-import androidx.preference.DialogPreference;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.preference.DialogPreference;
+import androidx.preference.PreferenceDialogFragment;
+
 public class CustomDialogPreference extends DialogPreference {
 
     private CustomPreferenceDialogFragment mFragment;
diff --git a/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java b/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java
index 04c3954..dfaff61 100644
--- a/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java
@@ -23,13 +23,14 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.annotation.CallSuper;
-import androidx.preference.EditTextPreferenceDialogFragment;
-import androidx.preference.EditTextPreference;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.EditText;
 
+import androidx.annotation.CallSuper;
+import androidx.preference.EditTextPreference;
+import androidx.preference.EditTextPreferenceDialogFragment;
+
 public class CustomEditTextPreference extends EditTextPreference {
 
     private CustomPreferenceDialogFragment mFragment;
diff --git a/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
index c98bc39..bc5a2c0 100644
--- a/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
@@ -16,6 +16,8 @@
 
 package com.android.settingslib;
 
+import static android.content.Context.TELEPHONY_SERVICE;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -30,6 +32,7 @@
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.util.Log;
+
 import androidx.annotation.VisibleForTesting;
 
 import java.io.BufferedReader;
@@ -43,8 +46,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static android.content.Context.TELEPHONY_SERVICE;
-
 public class DeviceInfoUtils {
     private static final String TAG = "DeviceInfoUtils";
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockImageSpan.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockImageSpan.java
index 360a34c..787f27e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockImageSpan.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockImageSpan.java
@@ -37,7 +37,7 @@
         mContext = context;
         mExtraPadding = mContext.getResources().getDimensionPixelSize(
                 R.dimen.restricted_icon_padding);
-        mRestrictedPadlock = RestrictedLockUtils.getRestrictedPadlock(mContext);
+        mRestrictedPadlock = RestrictedLockUtilsInternal.getRestrictedPadlock(mContext);
     }
 
     @Override
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java
similarity index 84%
rename from packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
rename to packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java
index 7f518c1..0094c2c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java
@@ -26,7 +26,6 @@
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
@@ -34,8 +33,6 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.provider.Settings;
-import androidx.annotation.VisibleForTesting;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.ForegroundColorSpan;
@@ -43,16 +40,17 @@
 import android.view.MenuItem;
 import android.widget.TextView;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.widget.LockPatternUtils;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Utility class to host methods usable in adding a restricted padlock icon and showing admin
  * support message dialog.
  */
-public class RestrictedLockUtils {
+public class RestrictedLockUtilsInternal extends RestrictedLockUtils {
     /**
      * @return drawables for displaying with settings that are locked by a device admin.
      */
@@ -517,33 +515,6 @@
         return enforcedAdmin;
     }
 
-    public static EnforcedAdmin getProfileOrDeviceOwner(Context context, int userId) {
-        return getProfileOrDeviceOwner(context, null, userId);
-    }
-
-    public static EnforcedAdmin getProfileOrDeviceOwner(
-            Context context, String enforcedRestriction, int userId) {
-        if (userId == UserHandle.USER_NULL) {
-            return null;
-        }
-        final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
-                Context.DEVICE_POLICY_SERVICE);
-        if (dpm == null) {
-            return null;
-        }
-        ComponentName adminComponent = dpm.getProfileOwnerAsUser(userId);
-        if (adminComponent != null) {
-            return new EnforcedAdmin(adminComponent, enforcedRestriction, userId);
-        }
-        if (dpm.getDeviceOwnerUserId() == userId) {
-            adminComponent = dpm.getDeviceOwnerComponentOnAnyUser();
-            if (adminComponent != null) {
-                return new EnforcedAdmin(adminComponent, enforcedRestriction, userId);
-            }
-        }
-        return null;
-    }
-
     public static EnforcedAdmin getDeviceOwner(Context context) {
         return getDeviceOwner(context, null);
     }
@@ -631,45 +602,6 @@
         }
     }
 
-    /**
-     * Send the intent to trigger the {@link android.settings.ShowAdminSupportDetailsDialog}.
-     */
-    public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {
-        final Intent intent = getShowAdminSupportDetailsIntent(context, admin);
-        int targetUserId = UserHandle.myUserId();
-        if (admin != null && admin.userId != UserHandle.USER_NULL
-                && isCurrentUserOrProfile(context, admin.userId)) {
-            targetUserId = admin.userId;
-        }
-        intent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, admin.enforcedRestriction);
-        context.startActivityAsUser(intent, new UserHandle(targetUserId));
-    }
-
-    public static Intent getShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {
-        final Intent intent = new Intent(Settings.ACTION_SHOW_ADMIN_SUPPORT_DETAILS);
-        if (admin != null) {
-            if (admin.component != null) {
-                intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin.component);
-            }
-            int adminUserId = UserHandle.myUserId();
-            if (admin.userId != UserHandle.USER_NULL) {
-                adminUserId = admin.userId;
-            }
-            intent.putExtra(Intent.EXTRA_USER_ID, adminUserId);
-        }
-        return intent;
-    }
-
-    public static boolean isCurrentUserOrProfile(Context context, int userId) {
-        UserManager um = UserManager.get(context);
-        for (UserInfo userInfo : um.getProfiles(UserHandle.myUserId())) {
-            if (userInfo.id == userId) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public static boolean isAdminInCurrentUserOrProfile(Context context, ComponentName admin) {
         DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
                 Context.DEVICE_POLICY_SERVICE);
@@ -715,75 +647,6 @@
         textView.setText(sb);
     }
 
-    public static class EnforcedAdmin {
-        @Nullable
-        public ComponentName component = null;
-        /**
-         * The restriction enforced by admin. It could be any user restriction or policy like
-         * {@link DevicePolicyManager#POLICY_DISABLE_CAMERA}.
-         */
-        @Nullable
-        public String enforcedRestriction = null;
-        public int userId = UserHandle.USER_NULL;
-
-        // We use this to represent the case where a policy is enforced by multiple admins.
-        public final static EnforcedAdmin MULTIPLE_ENFORCED_ADMIN = new EnforcedAdmin();
-
-        public static EnforcedAdmin createDefaultEnforcedAdminWithRestriction(
-                String enforcedRestriction) {
-            EnforcedAdmin enforcedAdmin = new EnforcedAdmin();
-            enforcedAdmin.enforcedRestriction = enforcedRestriction;
-            return enforcedAdmin;
-        }
-
-        public EnforcedAdmin(ComponentName component, int userId) {
-            this.component = component;
-            this.userId = userId;
-        }
-
-        public EnforcedAdmin(ComponentName component, String enforcedRestriction, int userId) {
-            this.component = component;
-            this.enforcedRestriction = enforcedRestriction;
-            this.userId = userId;
-        }
-
-        public EnforcedAdmin(EnforcedAdmin other) {
-            if (other == null) {
-                throw new IllegalArgumentException();
-            }
-            this.component = other.component;
-            this.enforcedRestriction = other.enforcedRestriction;
-            this.userId = other.userId;
-        }
-
-        public EnforcedAdmin() {
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            EnforcedAdmin that = (EnforcedAdmin) o;
-            return userId == that.userId &&
-                    Objects.equals(component, that.component) &&
-                    Objects.equals(enforcedRestriction, that.enforcedRestriction);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(component, enforcedRestriction, userId);
-        }
-
-        @Override
-        public String toString() {
-            return "EnforcedAdmin{" +
-                    "component=" + component +
-                    ", enforcedRestriction='" + enforcedRestriction +
-                    ", userId=" + userId +
-                    '}';
-        }
-    }
-
     /**
      * Static {@link LockPatternUtils} and {@link DevicePolicyManager} wrapper for testing purposes.
      * {@link LockPatternUtils} is an internal API not supported by robolectric.
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java
index 79e011c..ad7e995 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java
@@ -16,15 +16,16 @@
 
 package com.android.settingslib;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import android.content.Context;
 import android.os.UserHandle;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceViewHolder;
 
 /**
  * Preference class that supports being disabled by a user restriction
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
index a930bb8..1ba1f72 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
@@ -16,19 +16,18 @@
 
 package com.android.settingslib;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.TypedValue;
-import android.view.View;
 import android.widget.TextView;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 
 /**
  * Helper class for managing settings preferences that can be disabled
@@ -63,7 +62,7 @@
             }
             mAttrUserRestriction = data == null ? null : data.toString();
             // If the system has set the user restriction, then we shouldn't add the padlock.
-            if (RestrictedLockUtils.hasBaseUserRestriction(mContext, mAttrUserRestriction,
+            if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext, mAttrUserRestriction,
                     UserHandle.myUserId())) {
                 mAttrUserRestriction = null;
                 return;
@@ -134,7 +133,7 @@
      * @param userId user to check the restriction for.
      */
     public void checkRestrictionAndSetDisabled(String userRestriction, int userId) {
-        EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
+        EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,
                 userRestriction, userId);
         setDisabledByAdmin(admin);
     }
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java
index fe6d9fe..0ed507c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java
@@ -21,15 +21,16 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.UserHandle;
-import androidx.preference.SwitchPreference;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.SwitchPreference;
+
 /**
  * Version of SwitchPreference that can be disabled by a device admin
  * using a user restriction.
diff --git a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java
index b8516dc..c3993e9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java
+++ b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java
@@ -22,6 +22,7 @@
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.telephony.CarrierConfigManager;
+
 import androidx.annotation.VisibleForTesting;
 
 public class TetherUtil {
@@ -56,9 +57,10 @@
 
     public static boolean isTetherAvailable(Context context) {
         final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
-        final boolean tetherConfigDisallowed = RestrictedLockUtils.checkIfRestrictionEnforced(
-                context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null;
-        final boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction(
+        final boolean tetherConfigDisallowed = RestrictedLockUtilsInternal
+                .checkIfRestrictionEnforced(context, DISALLOW_CONFIG_TETHERING,
+                        UserHandle.myUserId()) != null;
+        final boolean hasBaseUserRestriction = RestrictedLockUtilsInternal.hasBaseUserRestriction(
                 context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
         return (cm.isTetheringSupported() || tetherConfigDisallowed) && !hasBaseUserRestriction;
     }
diff --git a/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java b/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java
index 3a26f46..02895a4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java
@@ -18,13 +18,14 @@
 
 import android.annotation.IntDef;
 import android.content.Context;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java
index c789c5d..6abe76a 100644
--- a/packages/SettingsLib/src/com/android/settingslib/Utils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java
@@ -23,6 +23,7 @@
 import android.os.UserManager;
 import android.print.PrintManager;
 import android.provider.Settings;
+import android.telephony.ServiceState;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.UserIcons;
@@ -391,4 +392,52 @@
                 || audioMode == AudioManager.MODE_IN_CALL
                 || audioMode == AudioManager.MODE_IN_COMMUNICATION;
     }
+
+    /**
+     * Return the service state is in-service or not.
+     * To make behavior consistent with SystemUI and Settings/AboutPhone/SIM status UI
+     *
+     * @param serviceState Service state. {@link ServiceState}
+     */
+    public static boolean isInService(ServiceState serviceState) {
+        if (serviceState == null) {
+            return false;
+        }
+        int state = getCombinedServiceState(serviceState);
+        if (state == ServiceState.STATE_POWER_OFF
+                || state == ServiceState.STATE_OUT_OF_SERVICE
+                || state == ServiceState.STATE_EMERGENCY_ONLY) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Return the combined service state.
+     * To make behavior consistent with SystemUI and Settings/AboutPhone/SIM status UI
+     *
+     * @param serviceState Service state. {@link ServiceState}
+     */
+    public static int getCombinedServiceState(ServiceState serviceState) {
+        if (serviceState == null) {
+            return ServiceState.STATE_OUT_OF_SERVICE;
+        }
+
+        // Consider the device to be in service if either voice or data
+        // service is available. Some SIM cards are marketed as data-only
+        // and do not support voice service, and on these SIM cards, we
+        // want to show signal bars for data service as well as the "no
+        // service" or "emergency calls only" text that indicates that voice
+        // is not available.
+        int state = serviceState.getState();
+        int dataState = serviceState.getDataRegState();
+        if (state == ServiceState.STATE_OUT_OF_SERVICE
+                || state == ServiceState.STATE_EMERGENCY_ONLY) {
+            if (dataState == ServiceState.STATE_IN_SERVICE) {
+                return ServiceState.STATE_IN_SERVICE;
+            }
+        }
+        return state;
+    }
 }
diff --git a/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java b/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java
index df76125..efac6bc 100644
--- a/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java
@@ -19,15 +19,12 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
 import android.content.Context;
 import android.view.RenderNodeAnimator;
 import android.view.View;
-import android.view.ViewPropertyAnimator;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 
-import com.android.internal.widget.LockPatternView;
 import com.android.settingslib.R;
 
 /**
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
index 21bac88..663b1f5 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
@@ -51,6 +51,11 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+
 import com.android.internal.R;
 import com.android.internal.util.ArrayUtils;
 
@@ -71,11 +76,6 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-
 /**
  * Keeps track of information about all installed applications, lazy-loading
  * as needed.
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/StorageStatsSource.java b/packages/SettingsLib/src/com/android/settingslib/applications/StorageStatsSource.java
index b15f35d..b457406 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/StorageStatsSource.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/StorageStatsSource.java
@@ -21,6 +21,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
+
 import androidx.annotation.VisibleForTesting;
 
 import java.io.IOException;
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
index 25e6831..4aca2bb 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
@@ -18,7 +18,6 @@
 
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
 import android.bluetooth.BluetoothHearingAid;
@@ -54,22 +53,23 @@
     private final BroadcastReceiver mBroadcastReceiver = new BluetoothBroadcastReceiver();
     private final BroadcastReceiver mProfileBroadcastReceiver = new BluetoothBroadcastReceiver();
     private final Collection<BluetoothCallback> mCallbacks = new ArrayList<>();
-
-    private android.os.Handler mReceiverHandler;
-    private Context mContext;
+    private final android.os.Handler mReceiverHandler;
+    private final Context mContext;
 
     interface Handler {
         void onReceive(Context context, Intent intent, BluetoothDevice device);
     }
 
     BluetoothEventManager(LocalBluetoothAdapter adapter,
-            CachedBluetoothDeviceManager deviceManager, Context context) {
+            CachedBluetoothDeviceManager deviceManager, Context context,
+            android.os.Handler handler) {
         mLocalAdapter = adapter;
         mDeviceManager = deviceManager;
         mAdapterIntentFilter = new IntentFilter();
         mProfileIntentFilter = new IntentFilter();
         mHandlerMap = new HashMap<>();
         mContext = context;
+        mReceiverHandler = handler;
 
         // Bluetooth on/off broadcasts
         addHandler(BluetoothAdapter.ACTION_STATE_CHANGED, new AdapterStateChangedHandler());
@@ -105,15 +105,6 @@
                 new AudioModeChangedHandler());
 
         mContext.registerReceiver(mBroadcastReceiver, mAdapterIntentFilter, null, mReceiverHandler);
-        mContext.registerReceiver(mProfileBroadcastReceiver, mProfileIntentFilter, null, mReceiverHandler);
-    }
-
-    public void setReceiverHandler(android.os.Handler handler) {
-        mContext.unregisterReceiver(mBroadcastReceiver);
-        mContext.unregisterReceiver(mProfileBroadcastReceiver);
-        mReceiverHandler = handler;
-        mContext.registerReceiver(mBroadcastReceiver, mAdapterIntentFilter, null, mReceiverHandler);
-        registerProfileIntentReceiver();
     }
 
     /** Register to start receiving callbacks for Bluetooth events. */
@@ -234,12 +225,6 @@
                 BluetoothDevice device) {
             int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
                     BluetoothAdapter.ERROR);
-            // Reregister Profile Broadcast Receiver as part of TURN OFF
-            if (state == BluetoothAdapter.STATE_OFF)
-            {
-                context.unregisterReceiver(mProfileBroadcastReceiver);
-                registerProfileIntentReceiver();
-            }
             // update local profiles and get paired devices
             mLocalAdapter.setBluetoothStateInt(state);
             // send callback to update UI and possibly start scanning
@@ -282,6 +267,9 @@
                 cachedDevice = mDeviceManager.addDevice(device);
                 Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice: "
                         + cachedDevice);
+            } else if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
+                // Dispatch device add callback to show bonded BT device in discovery mode
+                dispatchDeviceAdded(cachedDevice);
             }
             cachedDevice.setRssi(rssi);
             cachedDevice.setJustDiscovered(true);
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
index d837975..ee80aa1 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
@@ -5,9 +5,10 @@
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.DrawableRes;
 import android.util.Pair;
 
+import androidx.annotation.DrawableRes;
+
 import com.android.settingslib.R;
 import com.android.settingslib.graph.BluetoothDeviceLayerDrawable;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
index 68e1dfc..649900b 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -16,6 +16,7 @@
 
 package com.android.settingslib.bluetooth;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHearingAid;
@@ -27,7 +28,7 @@
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
-import android.bluetooth.BluetoothAdapter;
+
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settingslib.R;
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
index 47bd853..e8f47e1 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
@@ -31,8 +31,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * CachedBluetoothDeviceManager manages the set of remote Bluetooth devices.
@@ -211,26 +211,6 @@
         }
     }
 
-    /**
-     * Attempts to get the name of a remote device, otherwise returns the address.
-     *
-     * @param device The remote device.
-     * @return The name, or if unavailable, the address.
-     */
-    public String getName(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice != null && cachedDevice.getName() != null) {
-            return cachedDevice.getName();
-        }
-
-        String name = device.getAliasName();
-        if (name != null) {
-            return name;
-        }
-
-        return device.getAddress();
-    }
-
     public synchronized void clearNonBondedDevices() {
 
         mCachedDevicesMapForHearingAids.entrySet().removeIf(entries
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java
index 99f550b..2dd8eaf 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java
@@ -36,7 +36,6 @@
  */
 public class HeadsetProfile implements LocalBluetoothProfile {
     private static final String TAG = "HeadsetProfile";
-    private static boolean V = true;
 
     private BluetoothHeadset mService;
     private boolean mIsProfileReady;
@@ -59,7 +58,7 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            if (V) Log.d(TAG,"Bluetooth service connected");
+            Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothHeadset) proxy;
             // We just bound to the service, so refresh the UI for any connected HFP devices.
             List<BluetoothDevice> deviceList = mService.getConnectedDevices();
@@ -81,7 +80,7 @@
         }
 
         public void onServiceDisconnected(int profile) {
-            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            Log.d(TAG,"Bluetooth service disconnected");
             mProfileManager.callServiceDisconnectedListeners();
             mIsProfileReady=false;
         }
@@ -113,80 +112,76 @@
     }
 
     public boolean connect(BluetoothDevice device) {
-        if (mService == null) return false;
-        List<BluetoothDevice> sinks = mService.getConnectedDevices();
-        if (sinks != null) {
-            for (BluetoothDevice sink : sinks) {
-                Log.d(TAG,"Not disconnecting device = " + sink);
-            }
+        if (mService == null) {
+            return false;
         }
         return mService.connect(device);
     }
 
     public boolean disconnect(BluetoothDevice device) {
-        if (mService == null) return false;
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-        if (!deviceList.isEmpty()) {
-            for (BluetoothDevice dev : deviceList) {
-                if (dev.equals(device)) {
-                    if (V) Log.d(TAG,"Downgrade priority as user" +
-                                        "is disconnecting the headset");
-                    // Downgrade priority as user is disconnecting the headset.
-                    if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
-                        mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-                    }
-                    return mService.disconnect(device);
-                }
-            }
+        if (mService == null) {
+            return false;
         }
-        return false;
+        // Downgrade priority as user is disconnecting the headset.
+        if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
+            mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+        }
+        return mService.disconnect(device);
     }
 
     public int getConnectionStatus(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-        if (!deviceList.isEmpty()){
-            for (BluetoothDevice dev : deviceList) {
-                if (dev.equals(device)) {
-                    return mService.getConnectionState(device);
-                }
-            }
+        if (mService == null) {
+            return BluetoothProfile.STATE_DISCONNECTED;
         }
-        return BluetoothProfile.STATE_DISCONNECTED;
+        return mService.getConnectionState(device);
     }
 
     public boolean setActiveDevice(BluetoothDevice device) {
-        if (mService == null) return false;
+        if (mService == null) {
+            return false;
+        }
         return mService.setActiveDevice(device);
     }
 
     public BluetoothDevice getActiveDevice() {
-        if (mService == null) return null;
+        if (mService == null) {
+            return null;
+        }
         return mService.getActiveDevice();
     }
 
     public boolean isAudioOn() {
-        if (mService == null) return false;
+        if (mService == null) {
+            return false;
+        }
         return mService.isAudioOn();
     }
 
     public int getAudioState(BluetoothDevice device) {
-        if (mService == null) return BluetoothHeadset.STATE_AUDIO_DISCONNECTED;
+        if (mService == null) {
+            return BluetoothHeadset.STATE_AUDIO_DISCONNECTED;
+        }
         return mService.getAudioState(device);
     }
 
     public boolean isPreferred(BluetoothDevice device) {
-        if (mService == null) return false;
+        if (mService == null) {
+            return false;
+        }
         return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
     }
 
     public int getPreferred(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
+        if (mService == null) {
+            return BluetoothProfile.PRIORITY_OFF;
+        }
         return mService.getPriority(device);
     }
 
     public void setPreferred(BluetoothDevice device, boolean preferred) {
-        if (mService == null) return;
+        if (mService == null) {
+            return;
+        }
         if (preferred) {
             if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
                 mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -197,7 +192,9 @@
     }
 
     public List<BluetoothDevice> getConnectedDevices() {
-        if (mService == null) return new ArrayList<BluetoothDevice>(0);
+        if (mService == null) {
+            return new ArrayList<BluetoothDevice>(0);
+        }
         return mService.getDevicesMatchingConnectionStates(
               new int[] {BluetoothProfile.STATE_CONNECTED,
                          BluetoothProfile.STATE_CONNECTING,
@@ -235,7 +232,7 @@
     }
 
     protected void finalize() {
-        if (V) Log.d(TAG, "finalize()");
+        Log.d(TAG, "finalize()");
         if (mService != null) {
             try {
                 BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.HEADSET,
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java
index 6eaa620..1eeb4f0 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java
@@ -16,10 +16,10 @@
 
 package com.android.settingslib.bluetooth;
 
-import android.bluetooth.BluetoothHearingAid;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothHearingAid;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.util.Log;
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java
index 4b4db75..f9f6233 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java
@@ -16,10 +16,10 @@
 
 package com.android.settingslib.bluetooth;
 
-import android.bluetooth.BluetoothHeadsetClient;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothHeadsetClient;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothUuid;
 import android.content.Context;
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java
index 701ef00..fe6b222 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 /**
- * HidProfile handles Bluetooth HID profile.
+ * HidProfile handles Bluetooth HID Host role.
  */
 public class HidProfile implements LocalBluetoothProfile {
     private static final String TAG = "HidProfile";
@@ -115,11 +115,7 @@
         if (mService == null) {
             return BluetoothProfile.STATE_DISCONNECTED;
         }
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-
-        return !deviceList.isEmpty() && deviceList.get(0).equals(device)
-                ? mService.getConnectionState(device)
-                : BluetoothProfile.STATE_DISCONNECTED;
+        return mService.getConnectionState(device);
     }
 
     public boolean isPreferred(BluetoothDevice device) {
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java
index 1c50953..7fe6205 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.bluetooth;
 
 import android.content.Context;
+import android.os.Handler;
 import android.util.Log;
 
 import java.lang.ref.WeakReference;
@@ -57,7 +58,7 @@
             }
             // This will be around as long as this process is
             Context appContext = context.getApplicationContext();
-            sInstance = new LocalBluetoothManager(adapter, appContext);
+            sInstance = new LocalBluetoothManager(adapter, appContext, null);
             if (onInitCallback != null) {
                 onInitCallback.onBluetoothManagerInitialized(appContext, sInstance);
             }
@@ -66,15 +67,29 @@
         return sInstance;
     }
 
-    private LocalBluetoothManager(LocalBluetoothAdapter adapter, Context context) {
+    /**
+     * Returns a new instance of {@link LocalBluetoothManager} or null if Bluetooth is not
+     * supported for this hardware. This instance should be globally cached by the caller.
+     */
+    public static LocalBluetoothManager create(Context context, Handler handler) {
+        LocalBluetoothAdapter adapter = LocalBluetoothAdapter.getInstance();
+        if (adapter == null) {
+            return null;
+        }
+        return new LocalBluetoothManager(adapter, context.getApplicationContext(), handler);
+    }
+
+    private LocalBluetoothManager(
+            LocalBluetoothAdapter adapter, Context context, Handler handler) {
         mContext = context;
         mLocalAdapter = adapter;
-
         mCachedDeviceManager = new CachedBluetoothDeviceManager(context, this);
         mEventManager = new BluetoothEventManager(mLocalAdapter,
-                mCachedDeviceManager, context);
+                mCachedDeviceManager, context, handler);
         mProfileManager = new LocalBluetoothProfileManager(context,
                 mLocalAdapter, mCachedDeviceManager, mEventManager);
+
+        mProfileManager.updateLocalProfiles();
         mEventManager.readPairedDevices();
     }
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
index 8bb8210..36d209e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
@@ -35,8 +35,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.ParcelUuid;
-import androidx.annotation.VisibleForTesting;
 import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.R;
 import com.android.internal.util.CollectionUtils;
 
@@ -119,7 +121,6 @@
         // pass this reference to adapter and event manager (circular dependency)
         adapter.setProfileManager(this);
 
-        updateLocalProfiles();
         if (DEBUG) Log.d(TAG, "LocalBluetoothProfileManager construction complete");
     }
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/OppProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/OppProfile.java
index e5c0b14..dfd1622 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/OppProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/OppProfile.java
@@ -16,12 +16,12 @@
 
 package com.android.settingslib.bluetooth;
 
-import com.android.settingslib.R;
-
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 
+import com.android.settingslib.R;
+
 /**
  * OppProfile handles Bluetooth OPP.
  */
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
index ad3506f..b295f24 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
@@ -16,10 +16,10 @@
 
 package com.android.settingslib.bluetooth;
 
-import android.bluetooth.BluetoothPbapClient;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothPbapClient;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothUuid;
 import android.content.Context;
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java
index f0e259e..61602c6 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java
@@ -19,8 +19,8 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothSap;
 import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothSap;
 import android.bluetooth.BluetoothUuid;
 import android.content.Context;
 import android.os.ParcelUuid;
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java
index f4d647d..9572fb3 100644
--- a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java
@@ -1,6 +1,7 @@
 package com.android.settingslib.core;
 
 import android.content.Context;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java
index 7227304..78963f3 100644
--- a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java
+++ b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.metrics.LogMaker;
-import android.util.Log;
 import android.util.Pair;
 
 import com.android.internal.logging.MetricsLogger;
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/SharedPreferencesLogger.java b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/SharedPreferencesLogger.java
index a79f125..a28e45c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/SharedPreferencesLogger.java
+++ b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/SharedPreferencesLogger.java
@@ -20,11 +20,12 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
-import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 
 import java.util.Map;
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixin.java b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixin.java
index cb1ca59d..06d7c4d 100644
--- a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixin.java
+++ b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixin.java
@@ -16,17 +16,18 @@
 
 package com.android.settingslib.core.instrumentation;
 
+import static com.android.settingslib.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
+
 import android.app.Activity;
+import android.content.Intent;
+import android.os.SystemClock;
+
 import androidx.lifecycle.Lifecycle.Event;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
-import android.content.Intent;
 
-import android.os.SystemClock;
 import com.android.internal.logging.nano.MetricsProto;
 
-import static com.android.settingslib.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
-
 /**
  * Logs visibility change of a fragment.
  */
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/Lifecycle.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/Lifecycle.java
index 7ec757a..56de280 100644
--- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/Lifecycle.java
+++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/Lifecycle.java
@@ -18,19 +18,20 @@
 import static androidx.lifecycle.Lifecycle.Event.ON_ANY;
 
 import android.annotation.UiThread;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LifecycleRegistry;
-import androidx.lifecycle.OnLifecycleEvent;
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.PreferenceScreen;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settingslib.core.lifecycle.events.OnAttach;
 import com.android.settingslib.core.lifecycle.events.OnCreate;
 import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnCreate.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnCreate.java
index ada1537..ae67411 100644
--- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnCreate.java
+++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnCreate.java
@@ -16,12 +16,10 @@
 package com.android.settingslib.core.lifecycle.events;
 
 
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.OnLifecycleEvent;
 import android.os.Bundle;
 
 /**
- * @deprecated use {@link OnLifecycleEvent(Lifecycle.Event) }
+ * @deprecated use {@link androidx.lifecycle.OnLifecycleEvent}
  */
 @Deprecated
 public interface OnCreate {
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPrepareOptionsMenu.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPrepareOptionsMenu.java
index b9f1371..92ae9fd 100644
--- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPrepareOptionsMenu.java
+++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPrepareOptionsMenu.java
@@ -17,7 +17,6 @@
 package com.android.settingslib.core.lifecycle.events;
 
 import android.view.Menu;
-import android.view.MenuInflater;
 
 public interface OnPrepareOptionsMenu {
     void onPrepareOptionsMenu(Menu menu);
diff --git a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
index 75c2533..8fac3fd 100644
--- a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
+++ b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
@@ -20,9 +20,6 @@
 import android.content.res.XmlResourceParser;
 import android.icu.text.TimeZoneFormat;
 import android.icu.text.TimeZoneNames;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.text.BidiFormatter;
-import androidx.core.text.TextDirectionHeuristicsCompat;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -31,6 +28,10 @@
 import android.util.Log;
 import android.view.View;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.core.text.BidiFormatter;
+import androidx.core.text.TextDirectionHeuristicsCompat;
+
 import com.android.settingslib.R;
 
 import libcore.util.TimeZoneFinder;
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java
index b512448..caabf9a 100644
--- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java
@@ -22,13 +22,14 @@
 import android.content.Intent;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.text.TextUtils;
+
 import androidx.annotation.VisibleForTesting;
-import androidx.preference.SwitchPreference;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
 import androidx.preference.TwoStatePreference;
-import android.text.TextUtils;
 
 import com.android.settingslib.core.ConfirmationDialogController;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogdSizePreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogdSizePreferenceController.java
index e2f6b7b..5a82397 100644
--- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogdSizePreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogdSizePreferenceController.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.SystemProperties;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.ListPreference;
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java
index f277c16..8722674 100644
--- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java
@@ -22,12 +22,13 @@
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.SystemProperties;
+import android.text.TextUtils;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
-import android.text.TextUtils;
 
 import com.android.settingslib.R;
 import com.android.settingslib.core.ConfirmationDialogController;
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java
index 15d5522..f757aa4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.development;
 
 import android.content.Context;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java b/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java
index 13d28fc..b191f88 100644
--- a/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java
@@ -21,6 +21,7 @@
 import android.os.Build;
 import android.os.UserManager;
 import android.provider.Settings;
+
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 public class DevelopmentSettingsEnabler {
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/SystemPropPoker.java b/packages/SettingsLib/src/com/android/settingslib/development/SystemPropPoker.java
index dba22d0..3f16be1 100644
--- a/packages/SettingsLib/src/com/android/settingslib/development/SystemPropPoker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/SystemPropPoker.java
@@ -21,9 +21,10 @@
 import android.os.Parcel;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import android.util.Log;
 
 public class SystemPropPoker  {
     private static final String TAG = "SystemPropPoker";
diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractBluetoothAddressPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractBluetoothAddressPreferenceController.java
index 821b4d5..7455912 100644
--- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractBluetoothAddressPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractBluetoothAddressPreferenceController.java
@@ -19,10 +19,11 @@
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
+import android.text.TextUtils;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
-import android.text.TextUtils;
 
 import com.android.settingslib.R;
 import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java
index 10260de..a5f4036 100644
--- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java
@@ -21,13 +21,14 @@
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.os.PersistableBundle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settingslib.R;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java
index 45cd866..24da72e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java
@@ -20,6 +20,7 @@
 import android.net.ConnectivityManager;
 import android.net.LinkProperties;
 import android.net.wifi.WifiManager;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSerialNumberPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSerialNumberPreferenceController.java
index 60b29fb..d28792e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSerialNumberPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSerialNumberPreferenceController.java
@@ -18,10 +18,11 @@
 
 import android.content.Context;
 import android.os.Build;
+import android.text.TextUtils;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
-import android.text.TextUtils;
 
 import com.android.settingslib.core.AbstractPreferenceController;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java
index ba93970..5f72269 100644
--- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java
@@ -20,10 +20,11 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
+import android.text.format.DateUtils;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
-import android.text.format.DateUtils;
 
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java
index ffbda3a..9699294 100644
--- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java
@@ -22,10 +22,11 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
+import android.text.TextUtils;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
-import android.text.TextUtils;
 
 import com.android.settingslib.R;
 import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java b/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java
index af8fd4c..e0ca1ab 100644
--- a/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java
@@ -16,11 +16,8 @@
 
 package com.android.settingslib.display;
 
-import com.android.settingslib.R;
-
 import android.content.Context;
 import android.content.res.Resources;
-import android.hardware.display.DisplayManager;
 import android.os.AsyncTask;
 import android.os.RemoteException;
 import android.os.UserHandle;
@@ -31,6 +28,8 @@
 import android.view.IWindowManager;
 import android.view.WindowManagerGlobal;
 
+import com.android.settingslib.R;
+
 import java.util.Arrays;
 
 /**
diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java
index 94efc71..9feacac 100644
--- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java
+++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java
@@ -28,11 +28,11 @@
 import android.util.ArraySet;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.telephony.SmsApplication;
 import com.android.internal.util.ArrayUtils;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Handles getting/changing the whitelist for the exceptions to battery saving features.
  */
diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawable.java b/packages/SettingsLib/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawable.java
index d0804bb..f01eb2a 100644
--- a/packages/SettingsLib/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawable.java
+++ b/packages/SettingsLib/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawable.java
@@ -19,18 +19,13 @@
 import android.annotation.NonNull;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import androidx.annotation.VisibleForTesting;
 import android.view.Gravity;
-import android.view.View;
+
+import androidx.annotation.VisibleForTesting;
 
 import com.android.settingslib.R;
 import com.android.settingslib.Utils;
diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManager.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManager.java
index 628e70a..117b48f 100644
--- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManager.java
@@ -19,16 +19,17 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
 import android.text.TextUtils;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
 import com.android.settingslib.R;
 
 import java.text.Collator;
diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManagerCompat.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManagerCompat.java
index ad1368c..6f8c7ac 100644
--- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManagerCompat.java
+++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManagerCompat.java
@@ -24,6 +24,12 @@
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
 import com.android.settingslib.R;
 
 import java.text.Collator;
@@ -31,12 +37,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
 public class InputMethodAndSubtypeEnablerManagerCompat implements
         Preference.OnPreferenceChangeListener {
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtil.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtil.java
index 026bbd4..057123b 100644
--- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtil.java
@@ -25,15 +25,16 @@
 import android.icu.text.ListFormatter;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
 import com.android.internal.app.LocaleHelper;
 
 import java.util.HashMap;
diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilCompat.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilCompat.java
index 9ad2adb..692dfbf 100644
--- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilCompat.java
+++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilCompat.java
@@ -30,6 +30,11 @@
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
 import com.android.internal.app.LocaleHelper;
 
 import java.util.HashMap;
@@ -38,11 +43,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
 // TODO: Consolidate this with {@link InputMethodSettingValuesWrapper}.
 public class InputMethodAndSubtypeUtilCompat {
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java
index 2dec6c3..5c126b1 100644
--- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java
@@ -24,9 +24,6 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.UserHandle;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.Preference.OnPreferenceClickListener;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.inputmethod.InputMethodInfo;
@@ -34,9 +31,13 @@
 import android.view.inputmethod.InputMethodSubtype;
 import android.widget.Toast;
 
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference.OnPreferenceClickListener;
+
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settingslib.R;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.text.Collator;
@@ -207,7 +208,7 @@
             setEnabled(false);
         } else if (!mIsAllowedByOrganization) {
             EnforcedAdmin admin =
-                    RestrictedLockUtils.checkIfInputMethodDisallowed(getContext(),
+                    RestrictedLockUtilsInternal.checkIfInputMethodDisallowed(getContext(),
                             mImi.getPackageName(), UserHandle.myUserId());
             setDisabledByAdmin(admin);
         } else {
diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodSubtypePreference.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodSubtypePreference.java
index bb43581..69bfffb 100644
--- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodSubtypePreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodSubtypePreference.java
@@ -17,11 +17,12 @@
 package com.android.settingslib.inputmethod;
 
 import android.content.Context;
-import androidx.preference.Preference;
 import android.text.TextUtils;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.preference.Preference;
+
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.text.Collator;
diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/SwitchWithNoTextPreference.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/SwitchWithNoTextPreference.java
index 2b38697..2360298 100644
--- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/SwitchWithNoTextPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/SwitchWithNoTextPreference.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.inputmethod;
 
 import android.content.Context;
+
 import androidx.preference.SwitchPreference;
 
 public class SwitchWithNoTextPreference extends SwitchPreference {
diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java
index 444c19c..42306f6 100644
--- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java
+++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java
@@ -16,11 +16,12 @@
 
 package com.android.settingslib.license;
 
-import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Xml;
 
+import androidx.annotation.VisibleForTesting;
+
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java
index d3b1903..360c19c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java
+++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java
@@ -36,7 +36,8 @@
             "/vendor/etc/NOTICE.xml.gz",
             "/odm/etc/NOTICE.xml.gz",
             "/oem/etc/NOTICE.xml.gz",
-            "/product/etc/NOTICE.xml.gz"};
+            "/product/etc/NOTICE.xml.gz",
+            "/product_services/etc/NOTICE.xml.gz"};
     static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";
 
     private final Context mContext;
diff --git a/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationApps.java b/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationApps.java
index 96bed93..b8e1251 100644
--- a/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationApps.java
+++ b/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationApps.java
@@ -25,10 +25,12 @@
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
-import androidx.annotation.VisibleForTesting;
 import android.text.format.DateUtils;
 import android.util.IconDrawableFactory;
 import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/packages/SettingsLib/src/com/android/settingslib/net/ChartDataLoaderCompat.java b/packages/SettingsLib/src/com/android/settingslib/net/ChartDataLoaderCompat.java
index 3adbd4d..c3241bb 100644
--- a/packages/SettingsLib/src/com/android/settingslib/net/ChartDataLoaderCompat.java
+++ b/packages/SettingsLib/src/com/android/settingslib/net/ChartDataLoaderCompat.java
@@ -30,10 +30,10 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 
-import com.android.settingslib.AppItem;
-
 import androidx.loader.content.AsyncTaskLoader;
 
+import com.android.settingslib.AppItem;
+
 /**
  * Loader for historical chart data for both network and UID details.
  */
diff --git a/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java b/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java
index 224b967..c14f558 100644
--- a/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java
+++ b/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java
@@ -28,9 +28,9 @@
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.TrafficStats;
-import android.os.UserManager;
-import android.os.UserHandle;
 import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
diff --git a/packages/SettingsLib/src/com/android/settingslib/notification/ZenDurationDialog.java b/packages/SettingsLib/src/com/android/settingslib/notification/ZenDurationDialog.java
index 0ef46a1..b9197fe 100644
--- a/packages/SettingsLib/src/com/android/settingslib/notification/ZenDurationDialog.java
+++ b/packages/SettingsLib/src/com/android/settingslib/notification/ZenDurationDialog.java
@@ -33,6 +33,9 @@
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.policy.PhoneWindow;
@@ -40,9 +43,6 @@
 
 import java.util.Arrays;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
 public class ZenDurationDialog {
     private static final int[] MINUTE_BUCKETS = ZenModeConfig.MINUTE_BUCKETS;
     @VisibleForTesting protected static final int MIN_BUCKET_MINUTES = MINUTE_BUCKETS[0];
diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java
index 6a8b01a..ec77487 100644
--- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java
@@ -24,9 +24,10 @@
 import android.os.RemoteException;
 import android.service.settings.suggestions.ISuggestionService;
 import android.service.settings.suggestions.Suggestion;
+import android.util.Log;
+
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
-import android.util.Log;
 
 import java.util.List;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java
index ee8b6fe..6597daa 100644
--- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java
+++ b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java
@@ -17,15 +17,16 @@
 package com.android.settingslib.suggestions;
 
 import android.app.LoaderManager;
-import androidx.lifecycle.OnLifecycleEvent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Loader;
 import android.os.Bundle;
 import android.service.settings.suggestions.Suggestion;
-import androidx.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+import androidx.lifecycle.OnLifecycleEvent;
+
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.List;
diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixinCompat.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixinCompat.java
index 1791217..eea49bc 100644
--- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixinCompat.java
+++ b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixinCompat.java
@@ -23,15 +23,15 @@
 import android.service.settings.suggestions.Suggestion;
 import android.util.Log;
 
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import java.util.List;
-
 import androidx.annotation.Nullable;
 import androidx.lifecycle.OnLifecycleEvent;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.List;
+
 /**
  * Manages IPC communication to SettingsIntelligence for suggestion related services.
  */
diff --git a/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java b/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java
index 7cdbe71..9451b36 100644
--- a/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java
@@ -31,12 +31,13 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
-import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 
+import androidx.annotation.VisibleForTesting;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java b/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java
index f0548ff..c8c8ac2 100644
--- a/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java
+++ b/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.collection.ArrayMap;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java
index e16da84..fa59688 100644
--- a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java
+++ b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java
@@ -22,9 +22,10 @@
 import android.icu.text.MeasureFormat.FormatWidth;
 import android.icu.util.Measure;
 import android.icu.util.MeasureUnit;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
 import com.android.settingslib.R;
 
 import java.time.Instant;
diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/StringUtil.java b/packages/SettingsLib/src/com/android/settingslib/utils/StringUtil.java
index 3e3c039..88be2b0 100644
--- a/packages/SettingsLib/src/com/android/settingslib/utils/StringUtil.java
+++ b/packages/SettingsLib/src/com/android/settingslib/utils/StringUtil.java
@@ -27,6 +27,7 @@
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.TtsSpan;
+import android.util.Log;
 
 import com.android.settingslib.R;
 
@@ -36,6 +37,8 @@
 /** Utility class for generally useful string methods **/
 public class StringUtil {
 
+    private static final String TAG = "StringUtil";
+
     public static final int SECONDS_PER_MINUTE = 60;
     public static final int SECONDS_PER_HOUR = 60 * 60;
     public static final int SECONDS_PER_DAY = 24 * 60 * 60;
@@ -94,6 +97,7 @@
         final Locale locale = context.getResources().getConfiguration().locale;
         final MeasureFormat measureFormat = MeasureFormat.getInstance(
                 locale, FormatWidth.SHORT);
+        Log.i(TAG, "Locale is: " + locale);
         sb.append(measureFormat.formatMeasures(measureArray));
 
         if (measureArray.length == 1 && MeasureUnit.MINUTE.equals(measureArray[0].getUnit())) {
@@ -146,6 +150,7 @@
                 null /* default NumberFormat */,
                 RelativeDateTimeFormatter.Style.LONG,
                 android.icu.text.DisplayContext.CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE);
+        Log.i(TAG, "Locale is: " + locale);
 
         return formatter.format(value, RelativeDateTimeFormatter.Direction.LAST, unit);
     }
diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java
index 87a56c75..f02044d 100644
--- a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java
@@ -17,13 +17,14 @@
 package com.android.settingslib.widget;
 
 import android.content.Context;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.text.method.LinkMovementMethod;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 import com.android.settingslib.R;
 
 /**
diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java
index 5883754..2987c15 100644
--- a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java
+++ b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.widget;
 
 import android.content.Context;
+
 import androidx.preference.PreferenceFragment;
 import androidx.preference.PreferenceScreen;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixinCompat.java b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixinCompat.java
index 260ac83..d45e56d 100644
--- a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixinCompat.java
+++ b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixinCompat.java
@@ -18,13 +18,13 @@
 
 import android.content.Context;
 
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.SetPreferenceScreen;
 
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
 public class FooterPreferenceMixinCompat implements LifecycleObserver, SetPreferenceScreen {
 
     private final PreferenceFragmentCompat mFragment;
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index 18a44ed..e950e8e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -48,14 +48,12 @@
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.os.UserHandle;
-import androidx.annotation.NonNull;
-import android.text.Spannable;
-import android.text.SpannableString;
 import android.text.TextUtils;
-import android.text.style.TtsSpan;
 import android.util.ArraySet;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settingslib.R;
 import com.android.settingslib.utils.ThreadUtils;
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
index aa29f5a..f3c43cc 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
@@ -25,9 +25,6 @@
 import android.net.wifi.WifiConfiguration;
 import android.os.Looper;
 import android.os.UserHandle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.SparseArray;
@@ -35,9 +32,12 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 import com.android.settingslib.R;
 import com.android.settingslib.TronUtils;
-import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.Utils;
 import com.android.settingslib.wifi.AccessPoint.Speed;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java
index 5862e6f..afea5d2 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java
@@ -24,6 +24,7 @@
 import android.net.wifi.WifiInfo;
 import android.os.Bundle;
 import android.os.Parcelable;
+
 import androidx.annotation.Keep;
 
 import com.android.settingslib.wifi.AccessPoint.Speed;
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index 6211d12..9050b4b 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
@@ -41,15 +41,16 @@
 import android.os.Process;
 import android.os.SystemClock;
 import android.provider.Settings;
-import androidx.annotation.GuardedBy;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
 import android.text.format.DateUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settingslib.R;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java
index e73d952..93e4fce 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java
@@ -16,6 +16,7 @@
 package com.android.settingslib.wifi;
 
 import android.content.Context;
+
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java
index 4792317..4e6c005 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java
@@ -21,6 +21,7 @@
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.os.SystemClock;
+
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settingslib.R;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
index 7553313..1091e16 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
@@ -36,7 +36,7 @@
 import android.provider.Settings;
 import android.view.MenuItem;
 
-import com.android.internal.R;
+import android.R;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -70,17 +70,17 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mContext.getResources().getString(R.string.config_helpPackageNameKey))
+        when(mContext.getResources().getString(R.string.config_help_package_name_key))
                 .thenReturn(PACKAGE_NAME_KEY);
-        when(mContext.getResources().getString(R.string.config_helpPackageNameValue))
+        when(mContext.getResources().getString(R.string.config_help_package_name_value))
                 .thenReturn(PACKAGE_NAME_VALUE);
-        when(mContext.getResources().getString(R.string.config_helpIntentExtraKey))
+        when(mContext.getResources().getString(R.string.config_help_intent_extra_key))
                 .thenReturn(HELP_INTENT_EXTRA_KEY);
-        when(mContext.getResources().getString(R.string.config_helpIntentNameKey))
+        when(mContext.getResources().getString(R.string.config_help_intent_name_key))
                 .thenReturn(HELP_INTENT_NAME_KEY);
-        when(mContext.getResources().getString(R.string.config_feedbackIntentExtraKey))
+        when(mContext.getResources().getString(R.string.config_feedback_intent_extra_key))
                 .thenReturn(FEEDBACK_INTENT_EXTRA_KEY);
-        when(mContext.getResources().getString(R.string.config_feedbackIntentNameKey))
+        when(mContext.getResources().getString(R.string.config_feedback_intent_name_key))
                 .thenReturn(FEEDBACK_INTENT_NAME_KEY);
         when(mActivity.getPackageManager()).thenReturn(mPackageManager);
 
@@ -173,4 +173,4 @@
         verify(item).setVisible(true);
         verify(item).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
     }
-}
\ No newline at end of file
+}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java
index 710dbc22..fc8d9db 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java
@@ -20,8 +20,11 @@
 import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT;
 import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT;
 import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
+
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
@@ -57,7 +60,7 @@
     @Mock
     private PackageManager mPackageManager;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private RestrictedLockUtils.Proxy mProxy;
+    private RestrictedLockUtilsInternal.Proxy mProxy;
 
     private final int mUserId = 194;
     private final int mProfileId = 160;
@@ -75,7 +78,7 @@
         when(mContext.getPackageManager())
                 .thenReturn(mPackageManager);
 
-        RestrictedLockUtils.sProxy = mProxy;
+        RestrictedLockUtilsInternal.sProxy = mProxy;
     }
 
     @Test
@@ -88,8 +91,8 @@
                 thenReturn(Collections.singletonList(enforcingUser));
         setUpDeviceOwner(mAdmin1);
 
-        EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
-                userRestriction, mUserId);
+        EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal
+                .checkIfRestrictionEnforced(mContext, userRestriction, mUserId);
 
         assertThat(enforcedAdmin).isNotNull();
         assertThat(enforcedAdmin.enforcedRestriction).isEqualTo(userRestriction);
@@ -106,8 +109,8 @@
                 thenReturn(Collections.singletonList(enforcingUser));
         setUpProfileOwner(mAdmin1, mUserId);
 
-        EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
-                userRestriction, mUserId);
+        EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal
+                .checkIfRestrictionEnforced(mContext, userRestriction, mUserId);
 
         assertThat(enforcedAdmin).isNotNull();
         assertThat(enforcedAdmin.enforcedRestriction).isEqualTo(userRestriction);
@@ -117,8 +120,8 @@
     @Test
     public void checkIfDevicePolicyServiceDisabled_noEnforceAdminForManagedProfile() {
         when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(null);
-        final EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfAccountManagementDisabled(
-                mContext, "account_type", mUserId);
+        final EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal
+                .checkIfAccountManagementDisabled(mContext, "account_type", mUserId);
 
         assertThat(enforcedAdmin).isEqualTo(null);
     }
@@ -127,8 +130,8 @@
     public void checkIfDeviceAdminFeatureDisabled_noEnforceAdminForManagedProfile() {
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN))
                 .thenReturn(false);
-        final EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfAccountManagementDisabled(
-                mContext, "account_type", mUserId);
+        final EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal
+                .checkIfAccountManagementDisabled(mContext, "account_type", mUserId);
 
         assertThat(enforcedAdmin).isEqualTo(null);
     }
@@ -137,8 +140,8 @@
     public void checkIfKeyguardFeaturesDisabled_noEnforcedAdminForManagedProfile() {
         setUpManagedProfile(mUserId, new ComponentName[] {mAdmin1, mAdmin2});
 
-        final EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
-                mContext, KEYGUARD_DISABLE_FINGERPRINT, mUserId);
+        final EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal
+                .checkIfKeyguardFeaturesDisabled(mContext, KEYGUARD_DISABLE_FINGERPRINT, mUserId);
 
         assertThat(enforcedAdmin).isEqualTo(null);
     }
@@ -150,8 +153,8 @@
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(mAdmin1, mUserId))
                 .thenReturn(KEYGUARD_DISABLE_FINGERPRINT);
 
-        final EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
-                mContext, KEYGUARD_DISABLE_FINGERPRINT, mUserId);
+        final EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal
+                .checkIfKeyguardFeaturesDisabled(mContext, KEYGUARD_DISABLE_FINGERPRINT, mUserId);
 
         assertThat(enforcedAdmin).isEqualTo(new EnforcedAdmin(mAdmin1, mUserId));
     }
@@ -165,8 +168,8 @@
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(mAdmin2, mUserId))
                 .thenReturn(KEYGUARD_DISABLE_REMOTE_INPUT);
 
-        final EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
-                mContext, KEYGUARD_DISABLE_REMOTE_INPUT, mUserId);
+        final EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal
+                .checkIfKeyguardFeaturesDisabled(mContext, KEYGUARD_DISABLE_REMOTE_INPUT, mUserId);
 
         assertThat(enforcedAdmin).isEqualTo(EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN);
     }
@@ -184,19 +187,19 @@
                 .thenReturn(KEYGUARD_DISABLE_FINGERPRINT);
 
         // Querying the parent should return the policy, since it affects the parent.
-        EnforcedAdmin parent = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        EnforcedAdmin parent = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_FINGERPRINT, mUserId);
         assertThat(parent).isEqualTo(new EnforcedAdmin(mAdmin2, mProfileId));
 
         // Querying the child should return that too.
-        EnforcedAdmin profile = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        EnforcedAdmin profile = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_FINGERPRINT, mProfileId);
         assertThat(profile).isEqualTo(new EnforcedAdmin(mAdmin2, mProfileId));
 
         // Querying for some unrelated feature should return nothing. Nothing!
-        assertThat(RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        assertThat(RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_REMOTE_INPUT, mUserId)).isNull();
-        assertThat(RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        assertThat(RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_REMOTE_INPUT, mProfileId)).isNull();
     }
 
@@ -214,12 +217,12 @@
 
         // Querying the parent should not return the policy, because it's not a policy that should
         // affect parents even when the lock screen is unified.
-        EnforcedAdmin primary = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        EnforcedAdmin primary = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS, mUserId);
         assertThat(primary).isNull();
 
         // Querying the child should still return the policy.
-        EnforcedAdmin profile = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        EnforcedAdmin profile = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS, mProfileId);
         assertThat(profile).isEqualTo(new EnforcedAdmin(mAdmin2, mProfileId));
     }
@@ -241,12 +244,12 @@
 
         // Querying the parent should not return the policy, even though it's shared by default,
         // because the parent doesn't share a lock screen with the profile any more.
-        EnforcedAdmin parent = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        EnforcedAdmin parent = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_FINGERPRINT, mUserId);
         assertThat(parent).isNull();
 
         // Querying the child should still return the policy.
-        EnforcedAdmin profile = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        EnforcedAdmin profile = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_FINGERPRINT, mProfileId);
         assertThat(profile).isEqualTo(new EnforcedAdmin(mAdmin2, mProfileId));
     }
@@ -273,12 +276,12 @@
                 .thenReturn(KEYGUARD_DISABLE_FINGERPRINT);
 
         // Parent should get the policy.
-        EnforcedAdmin parent = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        EnforcedAdmin parent = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_FINGERPRINT, mUserId);
         assertThat(parent).isEqualTo(new EnforcedAdmin(mAdmin2, mProfileId));
 
         // Profile should not get the policy.
-        EnforcedAdmin profile = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+        EnforcedAdmin profile = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 mContext, KEYGUARD_DISABLE_FINGERPRINT, mProfileId);
         assertThat(profile).isNull();
     }
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java
index f00ae0b..79d682d6 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java
@@ -24,11 +24,12 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java
index fc0203a..e70baa1 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java
@@ -23,9 +23,9 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.net.ConnectivityManager;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.net.ConnectivityManager;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java
index efd7de3..c0b69f2 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java
@@ -19,16 +19,19 @@
 import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_DEFAULT;
 import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
 import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_SMALL;
+
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
-import androidx.preference.PreferenceViewHolder;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import androidx.preference.PreferenceViewHolder;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
index 09a2bd2..47e51f3 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
@@ -20,6 +20,7 @@
 import static com.android.settingslib.Utils.STORAGE_MANAGER_SHOW_OPT_IN_PROPERTY;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -39,6 +40,7 @@
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.provider.Settings.Secure;
+import android.telephony.ServiceState;
 import android.text.TextUtils;
 
 import org.junit.Before;
@@ -74,6 +76,8 @@
     private Context mContext;
     @Mock
     private LocationManager mLocationManager;
+    @Mock
+    private ServiceState mServiceState;
 
     @Before
     public void setUp() {
@@ -226,4 +230,71 @@
 
         assertThat(Utils.isAudioModeOngoingCall(mContext)).isFalse();
     }
+
+    @Test
+    public void isInService_servicestateNull_returnFalse() {
+        assertThat(Utils.isInService(null)).isFalse();
+    }
+
+    @Test
+    public void isInService_voiceInService_returnTrue() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        assertThat(Utils.isInService(mServiceState)).isTrue();
+    }
+
+    @Test
+    public void isInService_voiceOutOfServiceDataInService_returnTrue() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        assertThat(Utils.isInService(mServiceState)).isTrue();
+    }
+
+    @Test
+    public void isInService_voiceOutOfServiceDataOutOfService_returnFalse() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        assertThat(Utils.isInService(mServiceState)).isFalse();
+    }
+
+    @Test
+    public void isInService_ServiceStatePowerOff_returnFalse() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_POWER_OFF);
+        assertThat(Utils.isInService(mServiceState)).isFalse();
+    }
+
+    @Test
+    public void getCombinedServiceState_servicestateNull_returnOutOfService() {
+        assertThat(Utils.getCombinedServiceState(null)).isEqualTo(
+                ServiceState.STATE_OUT_OF_SERVICE);
+    }
+
+    @Test
+    public void getCombinedServiceState_ServiceStatePowerOff_returnPowerOff() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_POWER_OFF);
+        assertThat(Utils.getCombinedServiceState(mServiceState)).isEqualTo(
+                ServiceState.STATE_POWER_OFF);
+    }
+
+    @Test
+    public void getCombinedServiceState_voiceInService_returnInService() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        assertThat(Utils.getCombinedServiceState(mServiceState)).isEqualTo(
+                ServiceState.STATE_IN_SERVICE);
+    }
+
+    @Test
+    public void getCombinedServiceState_voiceOutOfServiceDataInService_returnInService() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        assertThat(Utils.getCombinedServiceState(mServiceState)).isEqualTo(
+                ServiceState.STATE_IN_SERVICE);
+    }
+
+    @Test
+    public void getCombinedServiceState_voiceOutOfServiceDataOutOfService_returnOutOfService() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        assertThat(Utils.getCombinedServiceState(mServiceState)).isEqualTo(
+                ServiceState.STATE_OUT_OF_SERVICE);
+    }
 }
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java
index 2dbabe0..19ce4242 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java
@@ -25,7 +25,6 @@
 
 import android.annotation.UserIdInt;
 import android.app.ApplicationPackageManager;
-import android.app.usage.IStorageStatsManager;
 import android.app.usage.StorageStats;
 import android.app.usage.StorageStatsManager;
 import android.content.ComponentName;
@@ -42,10 +41,10 @@
 import android.os.UserHandle;
 import android.util.IconDrawableFactory;
 
+import com.android.settingslib.SettingsLibRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.Callbacks;
 import com.android.settingslib.applications.ApplicationsState.Session;
-import com.android.settingslib.SettingsLibRobolectricTestRunner;
 import com.android.settingslib.testutils.shadow.ShadowUserManager;
 
 import org.junit.Before;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java
index 060b716..d8c459c 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.applications;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java
index 5f42b66..14bfb27 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java
@@ -54,7 +54,7 @@
         mContext = RuntimeEnvironment.application;
 
         mBluetoothEventManager = new BluetoothEventManager(mLocalAdapter,
-                mCachedDeviceManager, mContext);
+                mCachedDeviceManager, mContext, null);
     }
 
     /**
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java
index 7baded8..8ac611f 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java
@@ -139,7 +139,7 @@
     public void testGetName_validCachedDevice_nameFound() {
         CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);
         assertThat(cachedDevice1).isNotNull();
-        assertThat(mCachedDeviceManager.getName(mDevice1)).isEqualTo(DEVICE_ALIAS_1);
+        assertThat(mCachedDeviceManager.findDevice(mDevice1).getName()).isEqualTo(DEVICE_ALIAS_1);
     }
 
     /**
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java
index f223176..6f4c292 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java
@@ -76,9 +76,11 @@
         mContext = spy(RuntimeEnvironment.application);
         mLocalBluetoothAdapter = LocalBluetoothAdapter.getInstance();
         mEventManager = spy(new BluetoothEventManager(mLocalBluetoothAdapter, mDeviceManager,
-                mContext));
+                mContext, null));
         mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
         when(mDeviceManager.findDevice(mDevice)).thenReturn(mCachedBluetoothDevice);
+        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
+                mDeviceManager, mEventManager);
     }
 
     /**
@@ -88,20 +90,26 @@
     public void constructor_initiateHidAndHidDeviceProfile() {
         mShadowBluetoothAdapter.setSupportedProfiles(generateList(
                 new int[] {BluetoothProfile.HID_HOST, BluetoothProfile.HID_DEVICE}));
-        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
-                mDeviceManager, mEventManager);
+        mProfileManager.updateLocalProfiles();
 
         assertThat(mProfileManager.getHidProfile()).isNotNull();
         assertThat(mProfileManager.getHidDeviceProfile()).isNotNull();
     }
 
+    @Test
+    public void constructor_doNotUpdateProfiles() {
+        mProfileManager = spy(new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
+                mDeviceManager, mEventManager));
+
+        verify(mProfileManager, never()).updateLocalProfiles();
+    }
+
     /**
      * Verify updateLocalProfiles() for a local A2DP source adds A2dpProfile
      */
     @Test
     public void updateLocalProfiles_addA2dpToLocalProfiles() {
-        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
-                mDeviceManager, mEventManager);
+        mProfileManager.updateLocalProfiles();
         assertThat(mProfileManager.getA2dpProfile()).isNull();
         assertThat(mProfileManager.getHeadsetProfile()).isNull();
 
@@ -120,8 +128,7 @@
     public void updateProfiles_addHidProfileForRemoteDevice() {
         mShadowBluetoothAdapter.setSupportedProfiles(generateList(
                 new int[] {BluetoothProfile.HID_HOST}));
-        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
-                mDeviceManager, mEventManager);
+        mProfileManager.updateLocalProfiles();
         ParcelUuid[] uuids = new ParcelUuid[]{BluetoothUuid.Hid};
         ParcelUuid[] localUuids = new ParcelUuid[]{};
         List<LocalBluetoothProfile> profiles = new ArrayList<>();
@@ -143,11 +150,8 @@
     public void stateChangedHandler_receiveA2dpConnectionStateChanged_shouldDispatchCallback() {
         mShadowBluetoothAdapter.setSupportedProfiles(generateList(
                 new int[] {BluetoothProfile.A2DP}));
-        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
-                mDeviceManager, mEventManager);
-        // Refer to BluetoothControllerImpl, it will call setReceiverHandler after
-        // LocalBluetoothProfileManager created.
-        mEventManager.setReceiverHandler(null);
+        mProfileManager.updateLocalProfiles();
+
         mIntent = new Intent(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
         mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
         mIntent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, BluetoothProfile.STATE_CONNECTING);
@@ -167,11 +171,8 @@
     public void stateChangedHandler_receiveHeadsetConnectionStateChanged_shouldDispatchCallback() {
         mShadowBluetoothAdapter.setSupportedProfiles(generateList(
                 new int[] {BluetoothProfile.HEADSET}));
-        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
-                mDeviceManager, mEventManager);
-        // Refer to BluetoothControllerImpl, it will call setReceiverHandler after
-        // LocalBluetoothProfileManager created.
-        mEventManager.setReceiverHandler(null);
+        mProfileManager.updateLocalProfiles();
+
         mIntent = new Intent(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
         mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
         mIntent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, BluetoothProfile.STATE_CONNECTING);
@@ -191,11 +192,8 @@
     public void stateChangedHandler_receiveHAPConnectionStateChanged_shouldDispatchCallback() {
         mShadowBluetoothAdapter.setSupportedProfiles(generateList(
                 new int[] {BluetoothProfile.HEARING_AID}));
-        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
-                mDeviceManager, mEventManager);
-        // Refer to BluetoothControllerImpl, it will call setReceiverHandler after
-        // LocalBluetoothProfileManager created.
-        mEventManager.setReceiverHandler(null);
+        mProfileManager.updateLocalProfiles();
+
         mIntent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
         mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
         mIntent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, BluetoothProfile.STATE_CONNECTING);
@@ -215,11 +213,8 @@
     public void stateChangedHandler_receivePanConnectionStateChanged_shouldNotDispatchCallback() {
         mShadowBluetoothAdapter.setSupportedProfiles(generateList(
                 new int[] {BluetoothProfile.PAN}));
-        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
-                mDeviceManager, mEventManager);
-        // Refer to BluetoothControllerImpl, it will call setReceiverHandler after
-        // LocalBluetoothProfileManager created.
-        mEventManager.setReceiverHandler(null);
+        mProfileManager.updateLocalProfiles();
+
         mIntent = new Intent(BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
         mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
         mIntent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, BluetoothProfile.STATE_CONNECTING);
@@ -239,11 +234,8 @@
     public void stateChangedHandler_receivePanConnectionStateChangedWithoutProfile_shouldNotRefresh
     () {
         mShadowBluetoothAdapter.setSupportedProfiles(null);
-        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
-                mDeviceManager, mEventManager);
-        // Refer to BluetoothControllerImpl, it will call setReceiverHandler after
-        // LocalBluetoothProfileManager created.
-        mEventManager.setReceiverHandler(null);
+        mProfileManager.updateLocalProfiles();
+
         mIntent = new Intent(BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
         mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
         mIntent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, BluetoothProfile.STATE_CONNECTING);
@@ -262,11 +254,8 @@
     public void stateChangedHandler_receivePanConnectionStateChangedWithProfile_shouldRefresh() {
         mShadowBluetoothAdapter.setSupportedProfiles(generateList(
                 new int[] {BluetoothProfile.PAN}));
-        mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
-                mDeviceManager, mEventManager);
-        // Refer to BluetoothControllerImpl, it will call setReceiverHandler after
-        // LocalBluetoothProfileManager created.
-        mEventManager.setReceiverHandler(null);
+        mProfileManager.updateLocalProfiles();
+
         mIntent = new Intent(BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
         mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
         mIntent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, BluetoothProfile.STATE_CONNECTING);
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java
index 5c19e61..f4fd779 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java
@@ -16,6 +16,7 @@
 package com.android.settingslib.core.instrumentation;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java
index 017d373..be671e6 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java
@@ -15,10 +15,15 @@
  */
 package com.android.settingslib.core.instrumentation;
 
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .ACTION_SETTINGS_PREFERENCE_CHANGE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_NAME;
+
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.argThat;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java
index f34c338..f78573a 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java
@@ -16,6 +16,7 @@
 package com.android.settingslib.core.instrumentation;
 
 import static com.android.settingslib.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
+
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
@@ -30,6 +31,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.internal.logging.nano.MetricsProto;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java
index 28828a0..c23ad79 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java
@@ -16,6 +16,7 @@
 package com.android.settingslib.core.lifecycle;
 
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
@@ -25,6 +26,8 @@
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 
+import androidx.lifecycle.LifecycleOwner;
+
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.events.OnAttach;
 import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
@@ -43,8 +46,6 @@
 import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
 
-import androidx.lifecycle.LifecycleOwner;
-
 @RunWith(SettingsLibRobolectricTestRunner.class)
 public class LifecycleTest {
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java
index 7c65335..2a608399 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.development;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
@@ -26,9 +27,10 @@
 import android.content.pm.PackageManager;
 import android.os.UserManager;
 import android.provider.Settings;
-import androidx.preference.SwitchPreference;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
 
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java
index ae3072c..2f78899 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java
@@ -40,6 +40,7 @@
 
 import android.content.Context;
 import android.os.SystemProperties;
+
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceScreen;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java
index b0aaa25..ed128e0 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java
@@ -17,12 +17,14 @@
 package com.android.settingslib.development;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
-import androidx.lifecycle.LifecycleOwner;
 import android.os.SystemProperties;
+
+import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java
index 8ec7149..234b4d5 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java
@@ -22,6 +22,7 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java
index 7c127e5..aee956c 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.deviceinfo;
 
 import static com.google.common.truth.Truth.assertWithMessage;
+
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doReturn;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java
index cb7861b..2b490ee 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java
@@ -17,17 +17,19 @@
 package com.android.settingslib.deviceinfo;
 
 import static com.google.common.truth.Truth.assertWithMessage;
+
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
 import android.content.Context;
 import android.os.PersistableBundle;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java
index 8f144cd..1d957c3 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java
index 69fb86e..dc77400 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java
@@ -17,9 +17,11 @@
 package com.android.settingslib.deviceinfo;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java
index eaae405..eb77cb6 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.deviceinfo;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.robolectric.shadow.api.Shadow.extract;
 
 import android.net.ConnectivityManager;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java
index 20ce465..2e0348d 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java
@@ -23,9 +23,10 @@
 
 import android.content.Context;
 import android.os.SystemClock;
+import android.text.format.DateUtils;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
-import android.text.format.DateUtils;
 
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java
index 757df5b..359ea77 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
@@ -27,6 +28,7 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/display/BrightnessUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/display/BrightnessUtilsTest.java
index eb7ad6d..ca621ca 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/display/BrightnessUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/display/BrightnessUtilsTest.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.display;
 
 import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java
index c495511..59a3dd6 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java
@@ -24,7 +24,6 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 import java.util.Set;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java
index ba5a2c5..de96af4 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java
@@ -17,8 +17,8 @@
 package com.android.settingslib.fuelgauge;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java
index 23087a9..9b1fe5f 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.fuelgauge;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doNothing;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java
index 8a54aee..9c168f7 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java
@@ -1,6 +1,7 @@
 package com.android.settingslib.location;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.when;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java
index ccd2f53..89c319a 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java
@@ -20,6 +20,7 @@
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/ZenDurationDialogTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/ZenDurationDialogTest.java
index f47f41c..8147656 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/ZenDurationDialogTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/ZenDurationDialogTest.java
@@ -19,26 +19,15 @@
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyObject;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
 
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.NotificationManager;
-import android.content.Context;
+import static org.mockito.Mockito.spy;
+
 import android.content.ContentResolver;
-import android.content.DialogInterface;
-import android.content.res.Resources;
-import android.net.Uri;
+import android.content.Context;
 import android.provider.Settings;
 import android.service.notification.Condition;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.Button;
 
 import androidx.appcompat.app.AlertDialog;
 
@@ -47,9 +36,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(SettingsLibRobolectricTestRunner.class)
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinCompatTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinCompatTest.java
index 1ee3afa..449451a 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinCompatTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinCompatTest.java
@@ -18,7 +18,9 @@
 
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -26,6 +28,9 @@
 import android.content.ComponentName;
 import android.content.Context;
 
+import androidx.lifecycle.LifecycleOwner;
+import androidx.loader.app.LoaderManager;
+
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -38,9 +43,6 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import androidx.lifecycle.LifecycleOwner;
-import androidx.loader.app.LoaderManager;
-
 @RunWith(SettingsLibRobolectricTestRunner.class)
 @Config(shadows = ShadowSuggestionController.class)
 public class SuggestionControllerMixinCompatTest {
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java
index f486989..aac582f 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java
@@ -18,16 +18,19 @@
 
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.LoaderManager;
-import androidx.lifecycle.LifecycleOwner;
 import android.content.ComponentName;
 import android.content.Context;
 
+import androidx.lifecycle.LifecycleOwner;
+
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/FragmentTestUtils.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/FragmentTestUtils.java
index 8ba8606..d8e73b7 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/FragmentTestUtils.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/FragmentTestUtils.java
@@ -19,12 +19,12 @@
 import android.os.Bundle;
 import android.widget.LinearLayout;
 
-import org.robolectric.Robolectric;
-
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
+import org.robolectric.Robolectric;
+
 /**
  * Utilities for creating Fragments for testing.
  * <p>
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java
index 890abef..4705cd2 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java
@@ -22,14 +22,13 @@
 import static org.mockito.Mockito.when;
 
 import android.app.ActivityManager;
-
 import android.content.Context;
 import android.content.pm.UserInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settingslib.testutils.shadow.ShadowActivityManager;
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
+import com.android.settingslib.testutils.shadow.ShadowActivityManager;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java
index f2ef99c..6a9579b 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.utils;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java
index 743951a..e4bbbcb 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java
@@ -17,6 +17,7 @@
 package com.android.settingslib.utils;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinCompatTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinCompatTest.java
index 1abbaba..f56c111 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinCompatTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinCompatTest.java
@@ -17,12 +17,18 @@
 package com.android.settingslib.widget;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -33,11 +39,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.shadows.ShadowApplication;
 
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
 @RunWith(SettingsLibRobolectricTestRunner.class)
 public class FooterPreferenceMixinCompatTest {
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java
index 8604d18..366b720 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java
@@ -17,12 +17,18 @@
 package com.android.settingslib.widget;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -33,11 +39,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.shadows.ShadowApplication;
 
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
 @RunWith(SettingsLibRobolectricTestRunner.class)
 public class FooterPreferenceMixinTest {
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java
index 3280089..84a043e 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java
@@ -19,11 +19,12 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
-import androidx.preference.PreferenceViewHolder;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.widget.TextView;
 
+import androidx.preference.PreferenceViewHolder;
+
 import com.android.settingslib.R;
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
 
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
index ee2c2ff..86443bd 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
@@ -16,6 +16,7 @@
 package com.android.settingslib.wifi;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java
index d25adde..07c50fd 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java
@@ -16,6 +16,7 @@
 package com.android.settingslib.wifi;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doReturn;
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index a5616d5..e31dd1e 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -120,7 +120,7 @@
     <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
     <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
     <uses-permission android:name="android.permission.TRUST_LISTENER" />
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC_INTERNAL" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.RESET_FINGERPRINT_LOCKOUT" />
     <uses-permission android:name="android.permission.MANAGE_SLICE_PERMISSIONS" />
diff --git a/packages/SystemUI/res/layout/qs_customize_header.xml b/packages/SystemUI/res/layout/qs_customize_header.xml
index 093f971..d54dfee 100644
--- a/packages/SystemUI/res/layout/qs_customize_header.xml
+++ b/packages/SystemUI/res/layout/qs_customize_header.xml
@@ -20,8 +20,9 @@
     android:id="@android:id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/qs_tile_margin_top_bottom_negative"
     android:gravity="center"
-    android:minHeight="28dp"
+    android:minHeight="@dimen/qs_customize_header_min_height"
     android:textAppearance="@style/TextAppearance.QSEdit.Headers"
     android:textColor="?android:attr/colorAccent"
     android:text="@string/drag_to_rearrange_tiles" />
\ No newline at end of file
diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml
index fb9b5df..6bfd9b2 100644
--- a/packages/SystemUI/res/values-af/strings.xml
+++ b/packages/SystemUI/res/values-af/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Kennisgewings"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Battery kan binnekort afloop"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> oor"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> oor; ongeveer <xliff:g id="TIME">%s</xliff:g> oor op grond van jou gebruik"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> oor; ongeveer <xliff:g id="TIME">%s</xliff:g> oor"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> oor; ongeveer <xliff:g id="TIME">%2$s</xliff:g> oor op grond van jou gebruik"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> oor; ongeveer <xliff:g id="TIME">%2$s</xliff:g> oor"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> oor. Batterybespaarder is aan."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Kan nie deur USB laai nie. Gebruik die laaier wat jy saam met jou toestel gekry het."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Kan nie deur USB laai nie"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Liggingversoeke aktief"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Verwyder alle kennisgewings."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">nog <xliff:g id="NUMBER_1">%s</xliff:g> kennisgewings binne.</item>
       <item quantity="one">nog <xliff:g id="NUMBER_0">%s</xliff:g> kennisgewing binne.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Volkome\nstilte"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Net\nprioriteit"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Net\nwekkers"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laai tans (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> tot vol)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laai tans vinnig (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> tot vol)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laai tans stadig (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> tot vol)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laai tans (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> tot vol)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laai tans vinnig (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> tot vol)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laai tans stadig (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> tot vol)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Wissel gebruiker"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Wissel gebruiker, huidige gebruiker <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Huidige gebruiker <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"MELD GEBRUIKER AF"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Voeg nuwe gebruiker by?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Wanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon hul spasie opstel.\n\nEnige gebruiker kan programme vir al die ander gebruikers opdateer."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Verwyder gebruiker?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Alle programme en data van hierdie gebruiker sal uitgevee word."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Verwyder"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Links-ikoon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Regs-ikoon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Hou en sleep om teëls by te voeg"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Sleep hierheen om te verwyder"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Jy moet minstens 6 teëls hê"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Wysig"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Volskerm onder"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posisie <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Dubbeltik om te wysig."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Dubbeltik om by te voeg."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posisie <xliff:g id="POSITION">%1$d</xliff:g>. Dubbeltik om te kies."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Skuif <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Verwyder <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is by posisie <xliff:g id="POSITION">%2$d</xliff:g> gevoeg"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is verwyder"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is na posisie <xliff:g id="POSITION">%2$d</xliff:g> geskuif"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Voeg <xliff:g id="TILE_NAME">%1$s</xliff:g> by posisie <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Skuif <xliff:g id="TILE_NAME">%1$s</xliff:g> na posisie <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Kitsinstellingswysiger."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g>-kennisgewing: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Program sal dalk nie met verdeelde skerm werk nie."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Programinligting"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Gaan na blaaier"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobiele data"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi is af"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth is af"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Moenie Steur Nie is af"</string>
diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml
index 305082f..43a27f0 100644
--- a/packages/SystemUI/res/values-am/strings.xml
+++ b/packages/SystemUI/res/values-am/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"ማሳወቂያዎች"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ባትሪ በቅርቡ ሊያልቅ ይችላል"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> ይቀራል"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> ይቀራል፣ በእርስዎ አጠቃቀም ላይ በመመረት <xliff:g id="TIME">%s</xliff:g> ገደማ ይቀራል"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> ይቀራል፣ <xliff:g id="TIME">%s</xliff:g> ገደማ ይቀራል"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ይቀራል፣ በእርስዎ አጠቃቀም ላይ በመመረት <xliff:g id="TIME">%2$s</xliff:g> ገደማ ይቀራል"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ይቀራል፣ <xliff:g id="TIME">%2$s</xliff:g> ገደማ ይቀራል"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> ይቀራል። ባትሪ ቆጣቢ በርቷል።"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"በዩኤስቢ በኩል ኃይል መሙላት አይቻልም። ከመሣሪያዎ ጋር የመጣውን ኃይል መሙያ ይጠቀሙ።"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"በዩኤስቢ በኩል ኃይል መሙላት አይቻልም"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"የአካባቢ ጥያቄዎች ነቅተዋል"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"ሁሉንም ማሳወቂያዎች አጽዳ"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>፣ +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>፣ +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">ከውስጥ ተጨማሪ <xliff:g id="NUMBER_1">%s</xliff:g> ማሳወቂያዎች።</item>
       <item quantity="other">ከውስጥ ተጨማሪ <xliff:g id="NUMBER_1">%s</xliff:g> ማሳወቂያዎች።</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"ሙሉ ለሙሉ\nጸጥታ"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"ቅድሚያ ተሰጪ\nብቻ"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"ማንቂያዎች\nብቻ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ኃይል በመሙላት ላይ (እስኪሞላ ድረስ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • በፍጥነት ኃይልን በመሙላት ላይ (እስኪሞላ ድረስ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • በዝግታ ኃይልን በመሙላት ላይ (እስኪሞላ ድረስ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ኃይል በመሙላት ላይ (እስኪሞላ ድረስ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • በፍጥነት ኃይልን በመሙላት ላይ (እስኪሞላ ድረስ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • በዝግታ ኃይልን በመሙላት ላይ (እስኪሞላ ድረስ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ተጠቃሚ ቀይር"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ተጠቃሚ ይለውጡ፣ የአሁን ተጠቃሚ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"የአሁን ተጠቃሚ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ተጠቃሚን አስወጣ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"አዲስ ተጠቃሚ ይታከል?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"እርስዎ አንድ አዲስ ተጠቃሚ ሲያክሉ ያ ሰው የራሱ ቦታ ማዘጋጀት አለበት።\n\nማንኛውም ተጠቃሚ መተግበሪያዎችን ለሌሎች ተጠቃሚዎች ሁሉ ሊያዘምን ይችላል።"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"ተጠቃሚ ይወገድ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"ሁሉም የዚህ ተጠቃሚ መተግበሪያዎች እና ውሂብ ይሰረዛሉ።"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"አስወግድ"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"የግራ አዶ"</string>
     <string name="right_icon" msgid="3952104823293824311">"የቀኝ አዶ"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ፋይሎችን ለማከል ይዘት ይጎትቱ"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ለማስወገድ ወደዚህ ይጎትቱ"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"ቢያንስ 6 ሰቆች ያስፈልገዎታል"</string>
     <string name="qs_edit" msgid="2232596095725105230">"አርትዕ"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"የታች ሙሉ ማያ ገጽ"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ቦታ <xliff:g id="POSITION">%1$d</xliff:g>፣ <xliff:g id="TILE_NAME">%2$s</xliff:g>። ለማርትዕ ሁለቴ መታ ያድርጉ።"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>። ለማከል ሁለቴ መታ ያድርጉ።"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ቦታ <xliff:g id="POSITION">%1$d</xliff:g>። ለመምረጥ ሁለቴ መታ ያድርጉ።"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ን ይውሰዱ"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ን ያስወግዱ"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ወደ ቦታ <xliff:g id="POSITION">%2$d</xliff:g> ታክሏል"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ተወግዷል"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ወደ ቦታ <xliff:g id="POSITION">%2$d</xliff:g> ተወስዷል"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ን ወደ አቀማመጥ <xliff:g id="POSITION">%2$d</xliff:g> አክል"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ን ወደ አቀማመጥ <xliff:g id="POSITION">%2$d</xliff:g> አንቀሳቅስ"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"የፈጣን ቅንብሮች አርታዒ።"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"የ<xliff:g id="ID_1">%1$s</xliff:g> ማሳወቂያ፦ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"መተግበሪያ ከተከፈለ ማያ ገጽ ጋር ላይሠራ ይችላል"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"የመተግበሪያ መረጃ"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ወደ አሳሽ ሂድ"</string>
     <string name="mobile_data" msgid="7094582042819250762">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g>— <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g>— <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ጠፍቷል"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ብሉቱዝ ጠፍቷል"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"አትረብሽ ጠፍቷል"</string>
diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml
index dcf02d5..598d822 100644
--- a/packages/SystemUI/res/values-ar/strings.xml
+++ b/packages/SystemUI/res/values-ar/strings.xml
@@ -38,8 +38,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"الإشعارات"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"قد ينفد شحن البطارية قريبًا"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"متبقي <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"طاقة البطارية المتبقية <xliff:g id="PERCENTAGE">%s</xliff:g> ويتبقى على نفادها <xliff:g id="TIME">%s</xliff:g> تقريبًا بناءً على استخدامك."</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"طاقة البطارية المتبقية <xliff:g id="PERCENTAGE">%s</xliff:g> ويتبقى على نفادها <xliff:g id="TIME">%s</xliff:g> تقريبًا."</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"طاقة البطارية المتبقية <xliff:g id="PERCENTAGE">%1$s</xliff:g> ويتبقى على نفادها <xliff:g id="TIME">%2$s</xliff:g> تقريبًا بناءً على استخدامك."</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"طاقة البطارية المتبقية <xliff:g id="PERCENTAGE">%1$s</xliff:g> ويتبقى على نفادها <xliff:g id="TIME">%2$s</xliff:g> تقريبًا."</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"يتبقى <xliff:g id="PERCENTAGE">%s</xliff:g>. تم تفعيل ميزة توفير شحن البطارية."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"‏يتعذّر الشحن باستخدام USB. استخدم الشاحن المرفق بجهازك."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"‏يتعذّر الشحن باستخدام USB."</string>
@@ -261,7 +261,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"طلبات الموقع نشطة"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"محو جميع الإشعارات."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>، + <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>، + <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="zero"><xliff:g id="NUMBER_1">%s</xliff:g> إشعار آخر بداخل المجموعة.</item>
       <item quantity="two">إشعاران (<xliff:g id="NUMBER_1">%s</xliff:g>) آخران بداخل المجموعة.</item>
@@ -411,9 +411,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"كتم الصوت\nتمامًا"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"الأولوية \nفقط"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"التنبيهات\nفقط"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • جارٍ الشحن (يتبقى <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> حتى الامتلاء)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • جارٍ الشحن سريعًا (يتبقى <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> حتى الامتلاء)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • جارٍ الشحن ببطء (يتبقى <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> حتى الامتلاء)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • جارٍ الشحن (يتبقى <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> حتى الامتلاء)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • جارٍ الشحن سريعًا (يتبقى <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> حتى الامتلاء)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • جارٍ الشحن ببطء (يتبقى <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> حتى الامتلاء)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"تبديل المستخدم"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"تبديل المستخدم، المستخدم الحالي <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"المستخدم الحالي <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -438,6 +438,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"خروج المستخدم"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"هل تريد إضافة مستخدم جديد؟"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"عند إضافة مستخدم جديد، عليه إعداد مساحته.\n\nويُمكن لأي مستخدم تحديث التطبيقات لجميع المستخدمين الآخرين."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"هل تريد إزالة المستخدم؟"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"سيتم حذف جميع تطبيقات وبيانات هذا المستخدم."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"إزالة"</string>
@@ -749,6 +752,8 @@
     <string name="left_icon" msgid="3096287125959387541">"رمز اليسار"</string>
     <string name="right_icon" msgid="3952104823293824311">"رمز اليمين"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"انقر باستمرار مع السحب لإضافة المربعات."</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"اسحب هنا للإزالة"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"تحتاج إلى 6 مربعات على الأقل."</string>
     <string name="qs_edit" msgid="2232596095725105230">"تعديل"</string>
@@ -777,12 +782,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"عرض النافذة السفلية بملء الشاشة"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"الموضع <xliff:g id="POSITION">%1$d</xliff:g>، <xliff:g id="TILE_NAME">%2$s</xliff:g>. انقر مرّتين للتعديل."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. انقر مرّتين للإضافة."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"الموضع <xliff:g id="POSITION">%1$d</xliff:g>. انقر مرّتين للتحديد."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"نقل <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"إزالة <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"تمت إضافة <xliff:g id="TILE_NAME">%1$s</xliff:g> إلى الموضع <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"تمت إزالة <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"تم نقل <xliff:g id="TILE_NAME">%1$s</xliff:g> إلى الموضع <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"إضافة <xliff:g id="TILE_NAME">%1$s</xliff:g> إلى الموضع <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"نقل <xliff:g id="TILE_NAME">%1$s</xliff:g> إلى الموضع <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"برنامج تعديل الإعدادات السريعة."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"إشعار <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"يمكن ألا يعمل التطبيق مع وضع تقسيم الشاشة."</string>
@@ -843,7 +846,7 @@
     <string name="app_info" msgid="6856026610594615344">"معلومات عن التطبيق"</string>
     <string name="go_to_web" msgid="2650669128861626071">"الانتقال إلى المتصفح"</string>
     <string name="mobile_data" msgid="7094582042819250762">"بيانات الجوّال"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"‏تم إيقاف شبكة Wi-Fi"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"تم إيقاف البلوتوث."</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"تم إيقاف وضع \"عدم الإزعاج\""</string>
diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml
index c20b5bc..84d178b 100644
--- a/packages/SystemUI/res/values-as/strings.xml
+++ b/packages/SystemUI/res/values-as/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"জাননীসমূহ"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"বেটাৰি অতি সোনকালে শেষ হ\'ব পাৰে"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> বাকী আছে"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> অৱশিষ্ট আছে, আপোনাৰ ব্যৱহাৰক ভিত্তি কৰি প্ৰায় <xliff:g id="TIME">%s</xliff:g> বাকী আছে"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> অৱশিষ্ট আছে, প্ৰায় <xliff:g id="TIME">%s</xliff:g> বাকী"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> অৱশিষ্ট আছে, আপোনাৰ ব্যৱহাৰক ভিত্তি কৰি প্ৰায় <xliff:g id="TIME">%2$s</xliff:g> বাকী আছে"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> অৱশিষ্ট আছে, প্ৰায় <xliff:g id="TIME">%2$s</xliff:g> বাকী"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> বাকী আছে। বেটাৰি সঞ্চয়কাৰী অন হৈ আছে।"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"ইউএছবি জৰিয়তে চ্চাৰ্জ কৰিব নোৱাৰি। আপোনাৰ ডিভাইচৰ লগত পোৱা চ্চাৰ্জাৰটো ব্যৱহাৰ কৰক।"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"ইউএছবি জৰিয়তে চ্চাৰ্জ কৰিব নোৱাৰি"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"অৱস্থানৰ অনুৰোধ সক্ৰিয় হৈ আছে"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"সকলো জাননী মচক৷"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one"> ভিতৰত আৰু <xliff:g id="NUMBER_1">%s</xliff:g>টা জাননী আছে।</item>
       <item quantity="other"> ভিতৰত আৰু <xliff:g id="NUMBER_1">%s</xliff:g>টা জাননী আছে।</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"সম্পূর্ণ \n নিৰৱতা"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"কেৱল\nগুৰুত্বপূৰ্ণ"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"কেৱল\nএলাৰ্মসমূহ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • চ্চাৰ্জ কৰি থকা হৈছে (সম্পূৰ্ণ হ\'বলৈ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> বাকী)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • দ্ৰুতগতিৰে চ্চাৰ্জ কৰি থকা হৈছে (সম্পূৰ্ণ হ\'বলৈ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> বাকী)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • লাহে লাহে চ্চাৰ্জ কৰি থকা হৈছে (সম্পূৰ্ণ হ\'বলৈ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> বাকী)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • চ্চাৰ্জ কৰি থকা হৈছে (সম্পূৰ্ণ হ\'বলৈ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> বাকী)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • দ্ৰুতগতিৰে চ্চাৰ্জ কৰি থকা হৈছে (সম্পূৰ্ণ হ\'বলৈ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> বাকী)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • লাহে লাহে চ্চাৰ্জ কৰি থকা হৈছে (সম্পূৰ্ণ হ\'বলৈ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> বাকী)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ব্যৱহাৰকাৰী সলনি কৰক"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ব্যৱহাৰকাৰী সলনি কৰক, বৰ্তমানৰ ব্যৱহাৰকাৰী <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"বর্তমানৰ ব্যৱহাৰকাৰী <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ব্যৱহাৰকাৰীক লগ আউট কৰক"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"নতুন ব্যৱহাৰকাৰী যোগ কৰিবনে?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"আপুনি যেতিয়া এজন নতুন ব্যৱহাৰকাৰী যোগ কৰে, তেওঁ নিজৰ স্থান ছেট আপ কৰা প্ৰয়োজন।\n\nযিকোনো ব্যৱহাৰকাৰীয়ে নিজৰ লগতে আন ব্যৱহাৰকাৰীৰো এপ্ আপডেট কৰিব পাৰে।"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"ব্যৱহাৰকাৰীক আঁতৰাবনে?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"এই ব্যৱহাৰকাৰীৰ সকলো এপ্ আৰু ডেটা মচা হ\'ব।"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"আঁতৰাওক"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"বাওঁ আইকন"</string>
     <string name="right_icon" msgid="3952104823293824311">"সোঁ আইকন"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"টাইল যোগ কৰিবলৈ হেঁচি ধৰি টানি আনক"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"আঁতৰাবৰ বাবে টানি আনি ইয়াত এৰি দিয়ক"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"আপোনাক অতি কমেও ৬খন টাইল লাগিব"</string>
     <string name="qs_edit" msgid="2232596095725105230">"সম্পাদনা কৰক"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"তলৰ স্ক্ৰীণখন সম্পূৰ্ণ স্ক্ৰীণ কৰক"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"অৱস্থান <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>। সম্পাদনা কৰিবৰ বাবে দুবাৰ টিপক।"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>। যোগ কৰিবলৈ দুবাৰ টিপক।"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"অৱস্থান <xliff:g id="POSITION">%1$d</xliff:g>। বাছনি কৰিবলৈ দুবাৰ টিপক।"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> স্থানান্তৰ কৰক"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ক আঁতৰাওক"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ক <xliff:g id="POSITION">%2$d</xliff:g> অৱস্থানত যোগ কৰা হৈছে"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ক আঁতৰোৱা হৈছে"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ক <xliff:g id="POSITION">%2$d</xliff:g> অৱস্থানলৈ স্থানান্তৰ কৰা হৈছে"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"এই স্থান <xliff:g id="POSITION">%2$d</xliff:g>ত <xliff:g id="TILE_NAME">%1$s</xliff:g> যোগ কৰক"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ক এই স্থান <xliff:g id="POSITION">%2$d</xliff:g>লৈ যাওক"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ক্ষিপ্ৰ ছেটিংসমূহৰ সম্পাদক।"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> জাননী: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"বিভাজিত স্ক্ৰীণৰ সৈতে এপে হয়তো কাম নকৰিব।"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"এপ্ সম্পৰ্কীয় তথ্য"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ব্ৰাউজাৰলৈ যাওক"</string>
     <string name="mobile_data" msgid="7094582042819250762">"ম\'বাইল ডেটা"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"ৱাই-ফাই অফ অৱস্থাত আছে"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ব্লুটুথ অফ অৱস্থাত আছে"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"অসুবিধা নিদিব অফ অৱস্থাত আছে"</string>
diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml
index 239dc20..bbc67a5 100644
--- a/packages/SystemUI/res/values-az/strings.xml
+++ b/packages/SystemUI/res/values-az/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Bildirişlər"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Batareya tezliklə bitə bilər"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> qalır"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Qalan <xliff:g id="PERCENTAGE">%s</xliff:g>, istifadəyə əsasən təxminən <xliff:g id="TIME">%s</xliff:g> qalıb"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Qalan <xliff:g id="PERCENTAGE">%s</xliff:g>, təxminən <xliff:g id="TIME">%s</xliff:g> qalır"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Qalan <xliff:g id="PERCENTAGE">%1$s</xliff:g>, istifadəyə əsasən təxminən <xliff:g id="TIME">%2$s</xliff:g> qalıb"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Qalan <xliff:g id="PERCENTAGE">%1$s</xliff:g>, təxminən <xliff:g id="TIME">%2$s</xliff:g> qalır"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> qalır. Batareya Qənaəti aktivdir."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB vasitəsilə enerji yığa bilməz. Cihazla verilən adapterdən istifadə edin."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB vasitəsilə enerji yığa bilməz"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Məkan sorğuları arxivi"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Bütün bildirişləri sil."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Daxilində daha <xliff:g id="NUMBER_1">%s</xliff:g> bildiriş.</item>
       <item quantity="one">Daxilində daha <xliff:g id="NUMBER_0">%s</xliff:g> bildiriş.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Tam\nsakitlik"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Yalnız\nprioritet"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Yalnız\nalarmlar"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Enerji yığır (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> dolana qədər)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Sürətlə enerji yığır (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> dolana qədər)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Yavaş enerji yığır (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> dolana qədər)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Enerji yığır (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> dolana qədər)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Sürətlə enerji yığır (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> dolana qədər)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Yavaş enerji yığır (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> dolana qədər)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Switch user"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"İstifadəçiləri dəyişin, indiki istifadəçi: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Cari istifadəçi <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"İSTİFADƏÇİ ÇIXIŞI"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Yeni istifadəçi əlavə edilsin?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Yeni istifadəçi əlavə etdiyiniz zaman həmin şəxs öz yerini quraşdırmalıdır. \n\n İstənilən istifadəçi bütün digər istifadəçilərdən olan tətbiqləri güncəlləşdirə bilər."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"İstifadəçi silinsin?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Bu istifadəçinin bütün tətbiqləri və datası silinəcək."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Silin"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Sol ikona"</string>
     <string name="right_icon" msgid="3952104823293824311">"Sağ ikona"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Mozaika əlavə etmək üçün basıb saxlayaraq çəkin"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Silmək üçün bura sürüşdürün"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Minimum 6 mozaikaya ehtiyacınız var"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Redaktə edin"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Aşağı tam ekran"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g> mövqeyi, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Redaktə etmək üçün iki dəfə tıklayın."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Əlavə etmək üçün iki dəfə tıklayın."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g> mövqeyi. Seçmək üçün iki dəfə tıklayın."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> köçürün"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> silin"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g> mövqeyinə əlavə edildi"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> silindi"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g> mövqeyinə köçürüldü"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="POSITION">%2$d</xliff:g> pozisiyasına <xliff:g id="TILE_NAME">%1$s</xliff:g> əlavə edin"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="POSITION">%2$d</xliff:g> pozisiyasına <xliff:g id="TILE_NAME">%1$s</xliff:g> köçürün"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Sürətli ayarlar redaktoru."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> bildiriş: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Tətbiq bölünmüş ekran ilə işləməyə bilər."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Tətbiq məlumatı"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Brauzerə daxil edin"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobil data"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi deaktivdir"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth deaktivdir"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\"Narahat Etməyin\" deaktivdir"</string>
diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
index da236a8..679fdde 100644
--- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml
+++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
@@ -35,8 +35,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Obaveštenja"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Baterija će se možda uskoro isprazniti"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Još <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Još <xliff:g id="PERCENTAGE">%s</xliff:g>, na osnovu korišćenja ostalo je oko <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Još <xliff:g id="PERCENTAGE">%s</xliff:g>, ostalo je oko <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Još <xliff:g id="PERCENTAGE">%1$s</xliff:g>, na osnovu korišćenja ostalo je oko <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Još <xliff:g id="PERCENTAGE">%1$s</xliff:g>, ostalo je oko <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Još <xliff:g id="PERCENTAGE">%s</xliff:g>. Ušteda baterije je uključena."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Punjenje preko USB-a nije uspelo. Koristite punjač koji ste dobili uz uređaj."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Punjenje preko USB-a nije uspelo"</string>
@@ -258,7 +258,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Ima aktivnih zahteva za lokaciju"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Obriši sva obaveštenja."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"i još <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, još <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, još <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Još <xliff:g id="NUMBER_1">%s</xliff:g> obaveštenje u grupi.</item>
       <item quantity="few">Još <xliff:g id="NUMBER_1">%s</xliff:g> obaveštenja u grupi.</item>
@@ -402,9 +402,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Potpuna\ntišina"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Samo\npriorit. prekidi"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Samo\nalarmi"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Puni se (napuniće se za <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Brzo se puni (napuniće se za <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Sporo se puni (napuniće se za <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Puni se (napuniće se za <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Brzo se puni (napuniće se za <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Sporo se puni (napuniće se za <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Zameni korisnika"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Promenite korisnika, aktuelni korisnik je <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Aktuelni korisnik <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -429,6 +429,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ODJAVI KORISNIKA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Dodajete novog korisnika?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Kada dodate novog korisnika, ta osoba treba da podesi svoj prostor.\n\nSvaki korisnik može da ažurira aplikacije za sve ostale korisnike."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Želite li da uklonite korisnika?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Sve aplikacije i podaci ovog korisnika će biti izbrisani."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Ukloni"</string>
@@ -734,6 +737,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Leva ikona"</string>
     <string name="right_icon" msgid="3952104823293824311">"Desna ikona"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Zadržite i prevucite da biste dodali pločice"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Prevucite ovde da biste uklonili"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Treba da izaberete najmanje 6 pločica"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Izmeni"</string>
@@ -762,12 +767,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Režim celog ekrana za donji ekran"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g>. pozicija, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Dvaput dodirnite da biste izmenili."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Dvaput dodirnite da biste dodali."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g>. pozicija. Dvaput dodirnite da biste izabrali."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Premesti pločicu <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Ukloni pločicu <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Pločica <xliff:g id="TILE_NAME">%1$s</xliff:g> je dodata na <xliff:g id="POSITION">%2$d</xliff:g>. poziciju"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Pločica <xliff:g id="TILE_NAME">%1$s</xliff:g> je uklonjena"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Pločica <xliff:g id="TILE_NAME">%1$s</xliff:g> je premeštena na <xliff:g id="POSITION">%2$d</xliff:g>. poziciju"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Dodajte „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ na poziciju <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Premestite „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ na poziciju <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Uređivač za Brza podešavanja."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Obaveštenja za <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Aplikacija možda neće funkcionisati sa podeljenim ekranom."</string>
@@ -828,7 +831,7 @@
     <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Idi na pregledač"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobilni podaci"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi je isključen"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth je isključen"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Režim Ne uznemiravaj je isključen"</string>
diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml
index 2db91e8..d26b322 100644
--- a/packages/SystemUI/res/values-be/strings.xml
+++ b/packages/SystemUI/res/values-be/strings.xml
@@ -36,8 +36,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Апавяшчэнні"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Акумулятар хутка разрадзіцца"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Засталося <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Засталося <xliff:g id="PERCENTAGE">%s</xliff:g>, у вас ёсць каля <xliff:g id="TIME">%s</xliff:g> на аснове даных аб выкарыстанні вашай прылады"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Засталося <xliff:g id="PERCENTAGE">%s</xliff:g>, у вас ёсць каля <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Засталося <xliff:g id="PERCENTAGE">%1$s</xliff:g>, у вас ёсць каля <xliff:g id="TIME">%2$s</xliff:g> на аснове даных аб выкарыстанні вашай прылады"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Засталося <xliff:g id="PERCENTAGE">%1$s</xliff:g>, у вас ёсць каля <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Засталося <xliff:g id="PERCENTAGE">%s</xliff:g>. Уключана эканомія зараду."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Не ўдалося выканаць зарадку праз USB. Выкарыстоўвайце зараднае прыстасаванне з камплекта прылады."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Не ўдалося выканаць зарадку праз USB"</string>
@@ -261,7 +261,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Ёсць актыўныя запыты пра месцазнаходжанне"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Выдалiць усе апавяшчэннi."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Яшчэ <xliff:g id="NUMBER_1">%s</xliff:g> апавяшчэнне ўнутры.</item>
       <item quantity="few">Яшчэ <xliff:g id="NUMBER_1">%s</xliff:g> апавяшчэнні ўнутры.</item>
@@ -407,9 +407,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Поўная\nцішыня"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Толькі\nпрыярытэтныя"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Толькі\nбудзільнікі"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"Ідзе зарадка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, яшчэ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"Ідзе хуткая зарадка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, яшчэ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"Ідзе павольная зарадка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, яшчэ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"Ідзе зарадка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, яшчэ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"Ідзе хуткая зарадка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, яшчэ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"Ідзе павольная зарадка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, яшчэ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Перайсці да іншага карыстальніка"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Перайсці да іншага карыстальніка, бягучы карыстальнік <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Бягучы карыстальнік <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -434,6 +434,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ВЫКАНАЦЬ ВЫХАД КАРЫСТАЛЬНІКА"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Дадаць новага карыстальніка?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Пасля стварэння профіля яго трэба наладзіць.\n\nЛюбы карыстальнік прылады можа абнаўляць праграмы ўсіх іншых карыстальнікаў."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Выдаліць карыстальніка?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Усе праграмы і даныя гэтага карыстальніка будуць выдалены."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Выдаліць"</string>
@@ -741,6 +744,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Значок \"улева\""</string>
     <string name="right_icon" msgid="3952104823293824311">"Значок \"управа\""</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Перацягніце патрэбныя пліткі"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Перацягніце сюды, каб выдаліць"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Трэба па меншай меры 6 плітак"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Рэдагаваць"</string>
@@ -769,12 +774,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Ніжні экран – поўнаэкранны рэжым"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Месца: <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Краніце двойчы, каб рэдагаваць."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Краніце двойчы, каб дадаць."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Месца: <xliff:g id="POSITION">%1$d</xliff:g>. Краніце двойчы, каб выбраць."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Перамясціць <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Выдаліць <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Плітка <xliff:g id="TILE_NAME">%1$s</xliff:g> дададзена ў наступнае месца: <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Плітка <xliff:g id="TILE_NAME">%1$s</xliff:g> выдалена"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> перамешчана ў наступнае месца: <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Дадаць \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" у наступнае месца: <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Перамясціць \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" у наступнае месца: <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Рэдактар хуткіх налад."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Апавяшчэнне <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Праграма можа не працаваць у рэжыме дзялення экрана."</string>
@@ -835,7 +838,7 @@
     <string name="app_info" msgid="6856026610594615344">"Інфармацыя пра праграму"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Перайсці ў браўзер"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Маб. перадача даных"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi выключаны"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth выключаны"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Рэжым \"Не турбаваць\" выключаны"</string>
diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml
index 850977d..2bd6cc4 100644
--- a/packages/SystemUI/res/values-bg/strings.xml
+++ b/packages/SystemUI/res/values-bg/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Известия"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Батерията може скоро да се изтощи"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Остава/т <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Остава/т <xliff:g id="PERCENTAGE">%s</xliff:g> – още около <xliff:g id="TIME">%s</xliff:g> въз основа на използването"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Остава/т <xliff:g id="PERCENTAGE">%s</xliff:g> – още около <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Остава/т <xliff:g id="PERCENTAGE">%1$s</xliff:g> – още около <xliff:g id="TIME">%2$s</xliff:g> въз основа на използването"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Остава/т <xliff:g id="PERCENTAGE">%1$s</xliff:g> – още около <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Остава/т <xliff:g id="PERCENTAGE">%s</xliff:g>. Режимът за запазване на батерията е включен."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Зареждането през USB не е възможно. Използвайте оригиналното зарядно устройство."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Зареждането през USB не е възможно"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Активни заявки за местоположение"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Изчистване на всички известия."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, + <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, + <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Съдържа още <xliff:g id="NUMBER_1">%s</xliff:g> известия.</item>
       <item quantity="one">Съдържа още <xliff:g id="NUMBER_0">%s</xliff:g> известие.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Пълна\nтишина"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Само\nс приоритет"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Само\nбудилници"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Зарежда се (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до пълно зареждане)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Зарежда се бързо (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до пълно зареждане)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Зарежда се бавно (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до пълно зареждане)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Зарежда се (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> до пълно зареждане)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Зарежда се бързо (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> до пълно зареждане)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Зарежда се бавно (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> до пълно зареждане)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Превключване между потребителите"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Превключване на потребителя – текущият е <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Текущ потребител – <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ИЗЛИЗАНЕ НА ПОТРЕБИТЕЛЯ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Да се добави ли нов потреб.?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Когато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Да се премахне ли потребителят?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Всички приложения и данни на този потребител ще бъдат изтрити."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Премахване"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Лява икона"</string>
     <string name="right_icon" msgid="3952104823293824311">"Дясна икона"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Задръжте и плъзнете, за да добавите плочки"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Преместете тук с плъзгане за премахване"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Трябва да останат поне 6 плочки"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Редактиране"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Долен екран: Показване на цял екран"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Позиция <xliff:g id="POSITION">%1$d</xliff:g>, „<xliff:g id="TILE_NAME">%2$s</xliff:g>“. Докоснете двукратно, за да редактирате."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"„<xliff:g id="TILE_NAME">%1$s</xliff:g>“. Докоснете двукратно, за да добавите."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Позиция <xliff:g id="POSITION">%1$d</xliff:g>. Докоснете двукратно, за да изберете."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Преместване на „<xliff:g id="TILE_NAME">%1$s</xliff:g>“"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Премахване на „<xliff:g id="TILE_NAME">%1$s</xliff:g>“"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Добавихте „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ към позиция <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Премахнахте „<xliff:g id="TILE_NAME">%1$s</xliff:g>“"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Преместихте „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ на позиция <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Добавете „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ на позиция <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Преместете „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ на позиция <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Редактор за бързи настройки."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Известие от <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Приложението може да не работи в режим на разделен екран."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Информация за приложението"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Към браузъра"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Мобилни данни"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Функцията за Wi‑Fi е изключена"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Функцията за Bluetooth е изключена"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Режимът „Не безпокойте“ е изключен"</string>
diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml
index a6dc54a..866deae 100644
--- a/packages/SystemUI/res/values-bn/strings.xml
+++ b/packages/SystemUI/res/values-bn/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"বিজ্ঞপ্তিগুলি"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"চার্জ শীঘ্রই শেষ হয়ে যেতে পারে"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> অবশিষ্ট আছে"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> বাকি আছে, বর্তমান ব্যবহারের ভিত্তিতে আর <xliff:g id="TIME">%s</xliff:g> চলবে"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> বাকি আছে, আর <xliff:g id="TIME">%s</xliff:g> চলবে"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> বাকি আছে, বর্তমান ব্যবহারের ভিত্তিতে আর <xliff:g id="TIME">%2$s</xliff:g> চলবে"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> বাকি আছে, আর <xliff:g id="TIME">%2$s</xliff:g> চলবে"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> অবশিষ্ট আছে। ব্যাটারি সেভার চালু আছে।"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"ইউএসবি দিয়ে চার্জ করা যাবে না। ডিভাইসের সাথে যে চার্জারটি পেয়েছেন, সেটি ব্যবহার করুন।"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"ইউএসবি দিয়ে চার্জ করা যাবে না"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"লোকেশন অনুরোধ সক্রিয় রয়েছে"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"সমস্ত বিজ্ঞপ্তি সাফ করুন৷"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>টি"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">ভিতরে আরও <xliff:g id="NUMBER_1">%s</xliff:g>টি বিজ্ঞপ্তি আছে।</item>
       <item quantity="other">ভিতরে আরও <xliff:g id="NUMBER_1">%s</xliff:g>টি বিজ্ঞপ্তি আছে।</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"একদম\nনিরব"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"শুধুমাত্র\nঅগ্রাধিকার"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"শুধুমাত্র\nঅ্যালার্মগুলি"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • চার্জ হচ্ছে (পুরো চার্জ হতে <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> লাগবে)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • দ্রুত চার্জ হচ্ছে (পুরোটা হতে <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> লাগবে)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ধীরে চার্জ হচ্ছে (পুরোটা হতে <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> লাগবে)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • চার্জ হচ্ছে (পুরো চার্জ হতে <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> লাগবে)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • দ্রুত চার্জ হচ্ছে (পুরোটা হতে <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> লাগবে)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ধীরে চার্জ হচ্ছে (পুরোটা হতে <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> লাগবে)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ব্যবহারকারী পাল্টে দিন"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ব্যবহারকারী পাল্টান, বর্তমান ব্যবহারকারী <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"<xliff:g id="CURRENT_USER_NAME">%s</xliff:g> হল বর্তমান ব্যবহারকারী"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ব্যবহারকারীকে লগ-আউট করুন"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"নতুন ব্যবহারকারীকে যোগ করবেন?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"আপনি একজন নতুন ব্যবহারকারী যোগ করলে তাকে তার জায়গা সেট আপ করে নিতে হবে৷\n\nযেকোনো ব্যবহারকারী অন্য সব ব্যবহারকারীর জন্য অ্যাপ্লিকেশান আপডেট করতে পারবেন৷"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"ব্যবহারকারী সরাবেন?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"এই ব্যবহারকারীর সমস্ত অ্যাপ্লিকেশান ও ডেটা মুছে ফেলা হবে।"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"সরান"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"বাঁ দিকের আইকন"</string>
     <string name="right_icon" msgid="3952104823293824311">"ডানদিকের আইকন"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"টাইল যোগ করতে ট্যাপ করে টেনে আনুন"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"সরানোর জন্য এখানে টেনে আনুন"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"অন্তত ৬টি টাইল রাখতে হবে"</string>
     <string name="qs_edit" msgid="2232596095725105230">"সম্পাদনা করুন"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"নীচের অংশ নিয়ে পূর্ণ স্ক্রিন"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g> লোকেশন, <xliff:g id="TILE_NAME">%2$s</xliff:g>৷ সম্পাদনা করতে দুবার আলতো চাপুন৷"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>৷ যোগ করতে দুবার আলতো চাপুন৷"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g> অবস্থান৷ নির্বাচন করতে দুবার আলতো চাপুন৷"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> সরান"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> সরান"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="POSITION">%2$d</xliff:g> অবস্থানে <xliff:g id="TILE_NAME">%1$s</xliff:g> যোগ করা হয়েছে"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> মোছা হয়েছে"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g> এ সরানো হয়েছে"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g>-এ যোগ করুন"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g>-এ সরান"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"দ্রুত সেটিংস সম্পাদক৷"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> বিজ্ঞপ্তি: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"অ্যাপ্লিকেশানটি বিভক্ত স্ক্রীনে কাজ নাও করতে পারে৷"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"অ্যাপের তথ্য"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ব্রাউজারে যান"</string>
     <string name="mobile_data" msgid="7094582042819250762">"মোবাইল ডেটা"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"ওয়াই ফাই বন্ধ আছে"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ব্লুটুথ বন্ধ আছে"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"বিরক্ত করবেন না বিকল্পটি বন্ধ আছে"</string>
diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml
index 483b378..57089b8 100644
--- a/packages/SystemUI/res/values-bs/strings.xml
+++ b/packages/SystemUI/res/values-bs/strings.xml
@@ -35,8 +35,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Obavještenja"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Baterija će se uskoro isprazniti"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Preostalo <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Još <xliff:g id="PERCENTAGE">%s</xliff:g>. Preostalo je oko <xliff:g id="TIME">%s</xliff:g>, na osnovu vašeg korištenja"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Još <xliff:g id="PERCENTAGE">%s</xliff:g>. Preostalo je oko <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Još <xliff:g id="PERCENTAGE">%1$s</xliff:g>. Preostalo je oko <xliff:g id="TIME">%2$s</xliff:g>, na osnovu vašeg korištenja"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Još <xliff:g id="PERCENTAGE">%1$s</xliff:g>. Preostalo je oko <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Preostalo <xliff:g id="PERCENTAGE">%s</xliff:g>. Uključena je Ušteda baterije."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Punjenje putem USB-a nije moguće. Koristite punjač koji ste dobili uz uređaj."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Punjenje putem USB-a nije moguće"</string>
@@ -258,7 +258,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Aktiviran je zahtjev za lokaciju"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Uklanjanje svih obavještenja."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> i još <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> i još <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Još <xliff:g id="NUMBER_1">%s</xliff:g> obavještenje unutra.</item>
       <item quantity="few">Još <xliff:g id="NUMBER_1">%s</xliff:g> obavještenja unutra.</item>
@@ -402,9 +402,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Potpuna\ntišina"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Samo\nprioritetni prekidi"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Samo\nalarmi"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Punjenje (još <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do kraja)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Brzo punjenje (još <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do kraja)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Brzo punjenje (još <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do kraja)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Punjenje (još <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do kraja)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Brzo punjenje (još <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do kraja)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Brzo punjenje (još <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do kraja)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Zamijeni korisnika"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Zamijeni korisnika. Trenutni korisnik je <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Trenutni korisnik <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -429,6 +429,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ODJAVI KORISNIKA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Želite dodati novog korisnika?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Kada dodate novog korisnika, ta osoba treba uspostaviti svoj prostor.\n\nSvaki korisnik može ažurirati aplikacije za sve ostale korisnike."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Zaista želite ukloniti korisnika?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Sve aplikacije i podaci ovog korisnika bit će izbrisani."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Ukloni"</string>
@@ -736,6 +739,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ikona lijevo"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ikona desno"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Držite i prevucite da dodate polja"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Prevucite ovdje za uklanjanje"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Trebate najmanje šest polja"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Uredi"</string>
@@ -764,12 +769,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Donji ekran kao cijeli ekran"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Pozicija <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Dodirnite dvaput za uređivanje."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g> Dodirnite dvaput za dodavanje."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Pozicija <xliff:g id="POSITION">%1$d</xliff:g>. Dodirnite dvaput za odabir."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Pomjeri <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Ukloni <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> je dodan na poziciju <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> je uklonjen"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> je premješten na poziciju <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Dodaj <xliff:g id="TILE_NAME">%1$s</xliff:g> na poziciju <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Premjesti <xliff:g id="TILE_NAME">%1$s</xliff:g> na poziciju <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Uređivanje brzih postavki"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> obavještenje: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Aplikacija možda neće raditi na podijeljenom ekranu"</string>
@@ -830,7 +833,7 @@
     <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Idi na preglednik"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Prijenos podataka"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"WiFi veza je isključena"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth je isključen"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Način rada Ne ometaj je isključen"</string>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index 9c82b70..920db25 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notificacions"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"És possible que la bateria s\'esgoti aviat"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g>."</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g>; temps restant aproximat segons l\'ús que en fas: <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g>; temps restant aproximat: <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Queda un <xliff:g id="PERCENTAGE">%1$s</xliff:g>; temps restant aproximat segons l\'ús que en fas: <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Queda un <xliff:g id="PERCENTAGE">%1$s</xliff:g>; temps restant aproximat: <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g>. El mode d\'estalvi de bateria està activat."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"No es pot carregar el dispositiu per USB. Fes servir el carregador original del dispositiu."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"No es pot carregar per USB"</string>
@@ -63,7 +63,7 @@
     <string name="always_use_device" msgid="4015357883336738417">"Obre sempre <xliff:g id="APPLICATION">%1$s</xliff:g> quan es connecti <xliff:g id="USB_DEVICE">%2$s</xliff:g>"</string>
     <string name="always_use_accessory" msgid="3257892669444535154">"Obre sempre <xliff:g id="APPLICATION">%1$s</xliff:g> quan es connecti <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>"</string>
     <string name="usb_debugging_title" msgid="4513918393387141949">"Vols permetre la depuració per USB?"</string>
-    <string name="usb_debugging_message" msgid="2220143855912376496">"L\'empremta digital de la clau de l\'RSA de l\'equip és:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
+    <string name="usb_debugging_message" msgid="2220143855912376496">"L\'empremta digital de la clau de RSA de l\'equip és:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
     <string name="usb_debugging_always" msgid="303335496705863070">"Dona sempre permís des d\'aquest equip"</string>
     <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"No es permet la depuració per USB"</string>
     <string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"L\'usuari que té iniciada la sessió al dispositiu en aquest moment no pot activar la depuració per USB. Per utilitzar aquesta funció, cal canviar a l\'usuari principal."</string>
@@ -83,7 +83,7 @@
     <string name="use_ptp_button_title" msgid="7517127540301625751">"Munta com a càmera (PTP)"</string>
     <string name="installer_cd_button_title" msgid="2312667578562201583">"Instal·la aplic. transf. fitxers Android per a Mac"</string>
     <string name="accessibility_back" msgid="567011538994429120">"Enrere"</string>
-    <string name="accessibility_home" msgid="8217216074895377641">"Pàgina d\'inici"</string>
+    <string name="accessibility_home" msgid="8217216074895377641">"Inici"</string>
     <string name="accessibility_menu" msgid="316839303324695949">"Menú"</string>
     <string name="accessibility_accessibility_button" msgid="7601252764577607915">"Accessibilitat"</string>
     <string name="accessibility_rotate_button" msgid="7402949513740253006">"Gira la pantalla"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Sol·licituds d\'ubicació actives"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Esborra totes les notificacions."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> i <xliff:g id="OVERFLOW">%s</xliff:g> més"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> i <xliff:g id="OVERFLOW">%2$s</xliff:g> més"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notificacions més a l\'interior.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notificació més a l\'interior.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Silenci\ntotal"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Només\ninterr. prior."</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Només\nalarmes"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • S\'està carregant (temps restant: <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carregant ràpidament (temps restant: <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carregant lentament (temps restant: <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • S\'està carregant (temps restant: <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carregant ràpidament (temps restant: <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carregant lentament (temps restant: <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Canvia d\'usuari"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Canvia d\'usuari. Usuari actual: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Usuari actual: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"TANCA LA SESSIÓ DE L\'USUARI"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Vols afegir un usuari nou?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Quan s\'afegeix un usuari nou, aquest usuari ha de configurar-se l\'espai.\n\nQualsevol usuari pot actualitzar les aplicacions de la resta d\'usuaris."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Vols suprimir l\'usuari?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Totes les aplicacions i les dades d\'aquest usuari se suprimiran."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Suprimeix"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Icona de l\'esquerra"</string>
     <string name="right_icon" msgid="3952104823293824311">"Icona de la dreta"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Mantén premut i arrossega per afegir funcions"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrossega aquí per suprimir una funció"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Necessites com a mínim 6 mosaics"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Edita"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Pantalla inferior completa"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posició <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Fes doble toc per editar-la."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Fes doble toc per afegir-ho."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posició <xliff:g id="POSITION">%1$d</xliff:g>. Fes doble toc per seleccionar-la."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Mou <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Suprimeix <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> s\'ha afegit a la posició <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> s\'ha suprimit"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> s\'ha mogut a la posició <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Afegeix <xliff:g id="TILE_NAME">%1$s</xliff:g> a la posició <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Mou <xliff:g id="TILE_NAME">%1$s</xliff:g> a la posició <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor de configuració ràpida."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notificació de <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"És possible que l\'aplicació no funcioni amb la pantalla dividida."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Informació de l\'aplicació"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Ves al navegador"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Dades mòbils"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"La Wi-Fi està desactivada"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"El Bluetooth està desactivat"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"El mode No molestis està desactivat"</string>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index 5b99dd4..4077908 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -36,8 +36,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Oznámení"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Baterie se brzy vybije"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Zbývá <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Zbývá <xliff:g id="PERCENTAGE">%s</xliff:g>, při obvyklém využití asi <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Zbývá <xliff:g id="PERCENTAGE">%s</xliff:g>, asi <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Zbývá <xliff:g id="PERCENTAGE">%1$s</xliff:g>, při obvyklém využití asi <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Zbývá <xliff:g id="PERCENTAGE">%1$s</xliff:g>, asi <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Zbývá <xliff:g id="PERCENTAGE">%s</xliff:g>. Spořič baterie je zapnutý."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Nabíjení přes USB nefunguje. Používejte originální nabíječku, která byla dodána spolu se zařízením."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Nabíjení přes USB nefunguje"</string>
@@ -261,7 +261,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Aktivní žádosti o polohu"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Vymazat všechna oznámení."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"a ještě <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="few">Skupina obsahuje ještě <xliff:g id="NUMBER_1">%s</xliff:g> oznámení.</item>
       <item quantity="many">Skupina obsahuje ještě <xliff:g id="NUMBER_1">%s</xliff:g> oznámení.</item>
@@ -407,9 +407,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Úplné\nticho"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Pouze\nprioritní"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Pouze\nbudíky"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nabíjení (plně nabito za <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Rychlé nabíjení (plně nabito za <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Pomalé nabíjení (plně nabito za <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nabíjení (plně nabito za <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Rychlé nabíjení (plně nabito za <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Pomalé nabíjení (plně nabito za <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Přepnout uživatele"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Přepnout uživatele, aktuální uživatel: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Aktuální uživatel <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -434,6 +434,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ODHLÁSIT UŽIVATELE"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Přidat nového uživatele?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Když přidáte nového uživatele, musí si nastavit vlastní prostor.\n\nJakýkoli uživatel může aktualizovat aplikace všech ostatních uživatelů."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Odstranit uživatele?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Veškeré aplikace a data tohoto uživatele budou smazána."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Odstranit"</string>
@@ -741,6 +744,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ikona vlevo"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ikona vpravo"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Dlaždice přidáte podržením a přetažením"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Přetažením sem dlaždice odstraníte"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Potřebujete minimálně šest dlaždic"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Upravit"</string>
@@ -769,12 +774,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Dolní část na celou obrazovku"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Pozice <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Dvojitým klepnutím ji upravíte."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Dlaždici přidáte dvojitým klepnutím."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Pozice <xliff:g id="POSITION">%1$d</xliff:g>. Dvojitým klepnutím ji vyberete."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Přesunout dlaždici <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Odstranit dlaždici <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Dlaždice <xliff:g id="TILE_NAME">%1$s</xliff:g> byla přidána na pozici <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Dlaždice <xliff:g id="TILE_NAME">%1$s</xliff:g> byla odstraněna"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Dlaždice <xliff:g id="TILE_NAME">%1$s</xliff:g> byla přesunuta na pozici <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Přidat dlaždici <xliff:g id="TILE_NAME">%1$s</xliff:g> na pozici <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Přesunout dlaždici <xliff:g id="TILE_NAME">%1$s</xliff:g> na pozici <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor rychlého nastavení"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Oznámení aplikace <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Aplikace v režimu rozdělené obrazovky nemusí fungovat."</string>
@@ -835,7 +838,7 @@
     <string name="app_info" msgid="6856026610594615344">"O aplikaci"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Přejít do prohlížeče"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobilní data"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi je vypnuta"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth je vypnuto"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Režim Nerušit je vypnut"</string>
diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml
index 8e4f91b..2ebc0e8 100644
--- a/packages/SystemUI/res/values-da/strings.xml
+++ b/packages/SystemUI/res/values-da/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Underretninger"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Enheden løber muligvis snart tør for batteri"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> tilbage"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Der er <xliff:g id="PERCENTAGE">%s</xliff:g> tilbage eller ca. <xliff:g id="TIME">%s</xliff:g>, alt efter hvordan du bruger enheden"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> tilbage eller ca. <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Der er <xliff:g id="PERCENTAGE">%1$s</xliff:g> tilbage eller ca. <xliff:g id="TIME">%2$s</xliff:g>, alt efter hvordan du bruger enheden"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> tilbage eller ca. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> tilbage. Batterisparefunktion er aktiveret."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Enheden kan ikke oplades via USB. Brug den oplader, der fulgte med din enhed."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Enheden kan ikke oplades via USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Aktive placeringsanmodninger"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Ryd alle underretninger."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> mere"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> underretning mere i gruppen.</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> underretninger mere i gruppen.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Total\nstilhed"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Kun\nprioritet"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Kun\nalarmer"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Oplader (fuldt opladet om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Oplader hurtigt (fuldt opladet om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Oplader langsomt (fuldt opladet om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Oplader (fuldt opladet om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Oplader hurtigt (fuldt opladet om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Oplader langsomt (fuldt opladet om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Skift bruger"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Skift bruger. Nuværende bruger er <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Nuværende bruger: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"LOG BRUGEREN UD"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Vil du tilføje den nye bruger?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Når du tilføjer en ny bruger, skal personen konfigurere sit område.\n\nEnhver bruger kan opdatere apps for alle andre brugere."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Vil du fjerne brugeren?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Alle apps og data for denne bruger slettes."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Fjern"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Venstre ikon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Højre ikon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Tilføj felter ved at holde dem nede og trække"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Træk herhen for at fjerne"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Du skal bruge mindst seks felter"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Rediger"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Vis nederste del i fuld skærm"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Tryk to gange for at redigere."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Tryk to gange for at tilføje."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Position <xliff:g id="POSITION">%1$d</xliff:g>. Tryk to gange for at vælge."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Flyt <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Fjern <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> føjes til position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> fjernes"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> blev flyttet til position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Føj <xliff:g id="TILE_NAME">%1$s</xliff:g> til position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Flyt <xliff:g id="TILE_NAME">%1$s</xliff:g> til position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Redigeringsværktøj for Hurtige indstillinger."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g>-underretning: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Appen fungerer muligvis ikke i delt skærm."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Appinfo"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Gå til en browser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobildata"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi er slået fra"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth er slået fra"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Forstyr ikke er slået fra"</string>
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index d3d9458..6636c9d 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Benachrichtigungen"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Der Akku ist fast leer"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> verbleibend"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> ausstehend; noch ca. <xliff:g id="TIME">%s</xliff:g>, basierend auf deiner Nutzung"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> ausstehend; noch ca. <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ausstehend; noch ca. <xliff:g id="TIME">%2$s</xliff:g>, basierend auf deiner Nutzung"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ausstehend; noch ca. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Noch <xliff:g id="PERCENTAGE">%s</xliff:g>. Der Energiesparmodus ist aktiviert."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Aufladen über USB nicht möglich. Verwende das mit dem Gerät gelieferte Ladegerät."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Aufladen über USB nicht möglich"</string>
@@ -261,7 +261,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Standortanfragen aktiv"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Alle Benachrichtigungen löschen"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> weitere Benachrichtigungen vorhanden.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> weitere Benachrichtigung vorhanden.</item>
@@ -403,9 +403,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Laut-\nlos"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Nur\nwichtige"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Nur\nWecker"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Wird geladen (voll in <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Wird schnell geladen (voll in <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Wird langsam geladen (voll in <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Wird geladen (voll in <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Wird schnell geladen (voll in <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Wird langsam geladen (voll in <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Nutzer wechseln"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Nutzer wechseln. Aktueller Nutzer: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Aktueller Nutzer <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -430,6 +430,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"Nutzer abmelden"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Neuen Nutzer hinzufügen?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Wenn du einen neuen Nutzer hinzufügst, muss dieser seinen Bereich einrichten.\n\nJeder Nutzer kann Apps für alle anderen Nutzer aktualisieren."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Nutzer entfernen?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Alle Apps und Daten dieses Nutzers werden gelöscht."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Entfernen"</string>
@@ -733,6 +736,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Linkes Symbol"</string>
     <string name="right_icon" msgid="3952104823293824311">"Rechtes Symbol"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Halten und ziehen, um Kacheln hinzuzufügen"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Zum Entfernen hierher ziehen"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Du brauchst mindestens sechs Kacheln"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Bearbeiten"</string>
@@ -761,12 +766,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Vollbild unten"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Zum Bearbeiten doppeltippen."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Zum Hinzufügen doppeltippen."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Position <xliff:g id="POSITION">%1$d</xliff:g>. Zum Auswählen doppeltippen."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> verschieben"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> entfernen"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ist auf Position <xliff:g id="POSITION">%2$d</xliff:g> hinzugefügt worden"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> wurde entfernt"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> an Position <xliff:g id="POSITION">%2$d</xliff:g> verschoben"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> auf Position <xliff:g id="POSITION">%2$d</xliff:g> hinzufügen"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> auf Position <xliff:g id="POSITION">%2$d</xliff:g> verschieben"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor für Schnelleinstellungen."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Benachrichtigung von <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Die App funktioniert unter Umständen bei geteiltem Bildschirm nicht."</string>
@@ -827,7 +830,7 @@
     <string name="app_info" msgid="6856026610594615344">"App-Informationen"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Browser öffnen"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobile Daten"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"WLAN ist deaktiviert"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth ist deaktiviert"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\"Nicht stören\" ist deaktiviert"</string>
diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml
index 45e1b1b..60c412a 100644
--- a/packages/SystemUI/res/values-el/strings.xml
+++ b/packages/SystemUI/res/values-el/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Ειδοποιήσεις"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Η μπαταρία μπορεί να εξαντληθεί σύντομα"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Απομένουν <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Απομένει <xliff:g id="PERCENTAGE">%s</xliff:g>, περίπου <xliff:g id="TIME">%s</xliff:g> με βάση τη χρήση σας"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Απομένει <xliff:g id="PERCENTAGE">%s</xliff:g>, περίπου <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Απομένει <xliff:g id="PERCENTAGE">%1$s</xliff:g>, περίπου <xliff:g id="TIME">%2$s</xliff:g> με βάση τη χρήση σας"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Απομένει <xliff:g id="PERCENTAGE">%1$s</xliff:g>, περίπου <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Απομένουν <xliff:g id="PERCENTAGE">%s</xliff:g>. Η Εξοικονόμηση μπαταρίας είναι ενεργή."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Δεν είναι δυνατή η φόρτιση μέσω USB. Χρησιμοποιήστε τον φορτιστή που συνοδεύει τη συσκευή σας."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Δεν είναι δυνατή η φόρτιση μέσω USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Τα αιτήματα τοποθεσίας έχουν ενεργοποιηθεί"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Διαγραφή όλων των ειδοποιήσεων."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> επιπλέον ειδοποιήσεις εντός της ομάδας.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> επιπλέον ειδοποίηση εντός της ομάδας.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Πλήρης\nσίγαση"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Μόνο\nπροτεραιότητας"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Μόνο\nειδοποιήσεις"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Φόρτιση (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> για πλήρη φόρτιση)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Γρήγορη φόρτιση (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> για πλήρη φόρτιση)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Αργή φόρτιση (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> για πλήρη φόρτιση)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Φόρτιση (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> για πλήρη φόρτιση)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Γρήγορη φόρτιση (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> για πλήρη φόρτιση)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Αργή φόρτιση (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> για πλήρη φόρτιση)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Εναλλαγή χρήστη"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Εναλλαγή χρήστη, τρέχων χρήστης <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Τρέχων χρήστης <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ΑΠΟΣΥΝΔΕΣΗ ΧΡΗΣΤΗ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Προσθήκη νέου χρήστη;"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Κατά την προσθήκη ενός νέου χρήστη, αυτός θα πρέπει να ρυθμίσει το χώρο του.\n\nΟποιοσδήποτε χρήστης μπορεί να ενημερώσει τις εφαρμογές για όλους τους άλλους χρήστες."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Κατάργηση χρήστη;"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Όλες οι εφαρμογές και τα δεδομένα αυτού του χρήστη θα διαγραφούν."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Κατάργηση"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Αριστερό εικονίδιο"</string>
     <string name="right_icon" msgid="3952104823293824311">"Δεξιό εικονίδιο"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Κρατήστε και σύρετε για την προσθήκη πλακιδίων"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Σύρετε εδώ για κατάργηση"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Απαιτούνται τουλάχιστον 6 πλακίδια"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Επεξεργασία"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Κάτω πλήρης οθόνη"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Θέση <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Πατήστε δύο φορές για επεξεργασία."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Πατήστε δύο φορές για προσθήκη."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Θέση <xliff:g id="POSITION">%1$d</xliff:g>. Πατήστε δύο φορές για επιλογή."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Μετακίνηση <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Κατάργηση <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Το <xliff:g id="TILE_NAME">%1$s</xliff:g> προστέθηκε στη θέση <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Το <xliff:g id="TILE_NAME">%1$s</xliff:g> καταργείται"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Το <xliff:g id="TILE_NAME">%1$s</xliff:g> μετακινήθηκε στη θέση <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Προσθήκη <xliff:g id="TILE_NAME">%1$s</xliff:g> στη θέση <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Μετακίνηση <xliff:g id="TILE_NAME">%1$s</xliff:g> στη θέση <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Επεξεργασία γρήγορων ρυθμίσεων."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Ειδοποίηση <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Δεν είναι δυνατή η λειτουργία της εφαρμογής με διαχωρισμό οθόνης."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Πληροφορίες εφαρμογής"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Μετάβ. σε πρόγ. περ."</string>
     <string name="mobile_data" msgid="7094582042819250762">"Δεδομένα κινητής τηλεφωνίας"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Το Wi-Fi είναι ανενεργό"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Το Bluetooth είναι ανενεργό"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Η λειτουργία \"Μην ενοχλείτε\" είναι ανενεργή"</string>
diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml
index 561601d..c0afae6 100644
--- a/packages/SystemUI/res/values-en-rAU/strings.xml
+++ b/packages/SystemUI/res/values-en-rAU/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifications"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Battery may run out soon"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining, about <xliff:g id="TIME">%s</xliff:g> left based on your usage"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining, about <xliff:g id="TIME">%s</xliff:g> left"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left based on your usage"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining. Battery Saver is on."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Can\'t charge via USB. Use the charger that came with your device."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Can\'t charge via USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> more notifications inside.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> more notification inside.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Total\nsilence"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Priority\nonly"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alarms\nonly"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Switch user"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Switch user, current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,11 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"LOGOUT USER"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Add new user?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+    <string name="user_limit_reached_title" msgid="7374910700117359177">"User limit reached"</string>
+    <plurals name="user_limit_reached_message" formatted="false" msgid="1855040563671964242">
+      <item quantity="other">You can add up to <xliff:g id="COUNT">%d</xliff:g> users.</item>
+      <item quantity="one">Only one user can be created.</item>
+    </plurals>
     <string name="user_remove_user_title" msgid="4681256956076895559">"Remove user?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"All apps and data of this user will be deleted."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Remove"</string>
@@ -729,6 +734,7 @@
     <string name="left_icon" msgid="3096287125959387541">"Left icon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Right icon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Hold and drag to add tiles"</string>
+    <string name="drag_to_rearrange_tiles" msgid="4566074720193667473">"Hold and drag to rearrange tiles"</string>
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"You need at least 6 tiles"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Edit"</string>
@@ -757,12 +763,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Bottom full screen"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Double tap to edit."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Double tap to add."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Position <xliff:g id="POSITION">%1$d</xliff:g>. Double tap to select."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Remove <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is added to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is removed"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> moved to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Add <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Quick settings editor."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> notification: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"App may not work with split-screen."</string>
@@ -823,7 +827,7 @@
     <string name="app_info" msgid="6856026610594615344">"App info"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Go to browser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobile data"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi is off"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth is off"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Do Not Disturb is off"</string>
diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml
index efa8ad2..488c748 100644
--- a/packages/SystemUI/res/values-en-rCA/strings.xml
+++ b/packages/SystemUI/res/values-en-rCA/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifications"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Battery may run out soon"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining, about <xliff:g id="TIME">%s</xliff:g> left based on your usage"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining, about <xliff:g id="TIME">%s</xliff:g> left"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left based on your usage"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining. Battery Saver is on."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Can\'t charge via USB. Use the charger that came with your device."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Can\'t charge via USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> more notifications inside.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> more notification inside.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Total\nsilence"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Priority\nonly"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alarms\nonly"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Switch user"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Switch user, current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,11 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"LOGOUT USER"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Add new user?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+    <string name="user_limit_reached_title" msgid="7374910700117359177">"User limit reached"</string>
+    <plurals name="user_limit_reached_message" formatted="false" msgid="1855040563671964242">
+      <item quantity="other">You can add up to <xliff:g id="COUNT">%d</xliff:g> users.</item>
+      <item quantity="one">Only one user can be created.</item>
+    </plurals>
     <string name="user_remove_user_title" msgid="4681256956076895559">"Remove user?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"All apps and data of this user will be deleted."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Remove"</string>
@@ -729,6 +734,7 @@
     <string name="left_icon" msgid="3096287125959387541">"Left icon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Right icon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Hold and drag to add tiles"</string>
+    <string name="drag_to_rearrange_tiles" msgid="4566074720193667473">"Hold and drag to rearrange tiles"</string>
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"You need at least 6 tiles"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Edit"</string>
@@ -757,12 +763,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Bottom full screen"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Double tap to edit."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Double tap to add."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Position <xliff:g id="POSITION">%1$d</xliff:g>. Double tap to select."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Remove <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is added to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is removed"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> moved to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Add <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Quick settings editor."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> notification: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"App may not work with split-screen."</string>
@@ -823,7 +827,7 @@
     <string name="app_info" msgid="6856026610594615344">"App info"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Go to browser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobile data"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi is off"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth is off"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Do Not Disturb is off"</string>
diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml
index 561601d..c0afae6 100644
--- a/packages/SystemUI/res/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifications"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Battery may run out soon"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining, about <xliff:g id="TIME">%s</xliff:g> left based on your usage"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining, about <xliff:g id="TIME">%s</xliff:g> left"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left based on your usage"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining. Battery Saver is on."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Can\'t charge via USB. Use the charger that came with your device."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Can\'t charge via USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> more notifications inside.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> more notification inside.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Total\nsilence"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Priority\nonly"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alarms\nonly"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Switch user"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Switch user, current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,11 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"LOGOUT USER"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Add new user?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+    <string name="user_limit_reached_title" msgid="7374910700117359177">"User limit reached"</string>
+    <plurals name="user_limit_reached_message" formatted="false" msgid="1855040563671964242">
+      <item quantity="other">You can add up to <xliff:g id="COUNT">%d</xliff:g> users.</item>
+      <item quantity="one">Only one user can be created.</item>
+    </plurals>
     <string name="user_remove_user_title" msgid="4681256956076895559">"Remove user?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"All apps and data of this user will be deleted."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Remove"</string>
@@ -729,6 +734,7 @@
     <string name="left_icon" msgid="3096287125959387541">"Left icon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Right icon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Hold and drag to add tiles"</string>
+    <string name="drag_to_rearrange_tiles" msgid="4566074720193667473">"Hold and drag to rearrange tiles"</string>
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"You need at least 6 tiles"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Edit"</string>
@@ -757,12 +763,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Bottom full screen"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Double tap to edit."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Double tap to add."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Position <xliff:g id="POSITION">%1$d</xliff:g>. Double tap to select."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Remove <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is added to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is removed"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> moved to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Add <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Quick settings editor."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> notification: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"App may not work with split-screen."</string>
@@ -823,7 +827,7 @@
     <string name="app_info" msgid="6856026610594615344">"App info"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Go to browser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobile data"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi is off"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth is off"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Do Not Disturb is off"</string>
diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml
index 561601d..c0afae6 100644
--- a/packages/SystemUI/res/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifications"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Battery may run out soon"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining, about <xliff:g id="TIME">%s</xliff:g> left based on your usage"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining, about <xliff:g id="TIME">%s</xliff:g> left"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left based on your usage"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining. Battery Saver is on."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Can\'t charge via USB. Use the charger that came with your device."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Can\'t charge via USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> more notifications inside.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> more notification inside.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Total\nsilence"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Priority\nonly"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alarms\nonly"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Switch user"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Switch user, current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,11 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"LOGOUT USER"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Add new user?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+    <string name="user_limit_reached_title" msgid="7374910700117359177">"User limit reached"</string>
+    <plurals name="user_limit_reached_message" formatted="false" msgid="1855040563671964242">
+      <item quantity="other">You can add up to <xliff:g id="COUNT">%d</xliff:g> users.</item>
+      <item quantity="one">Only one user can be created.</item>
+    </plurals>
     <string name="user_remove_user_title" msgid="4681256956076895559">"Remove user?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"All apps and data of this user will be deleted."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Remove"</string>
@@ -729,6 +734,7 @@
     <string name="left_icon" msgid="3096287125959387541">"Left icon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Right icon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Hold and drag to add tiles"</string>
+    <string name="drag_to_rearrange_tiles" msgid="4566074720193667473">"Hold and drag to rearrange tiles"</string>
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"You need at least 6 tiles"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Edit"</string>
@@ -757,12 +763,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Bottom full screen"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Double tap to edit."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Double tap to add."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Position <xliff:g id="POSITION">%1$d</xliff:g>. Double tap to select."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Remove <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is added to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is removed"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> moved to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Add <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Quick settings editor."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> notification: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"App may not work with split-screen."</string>
@@ -823,7 +827,7 @@
     <string name="app_info" msgid="6856026610594615344">"App info"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Go to browser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobile data"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi is off"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth is off"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Do Not Disturb is off"</string>
diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml
index 881ee90..f775bb1 100644
--- a/packages/SystemUI/res/values-en-rXC/strings.xml
+++ b/packages/SystemUI/res/values-en-rXC/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎Notifications‎‏‎‎‏‎"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎Battery may run out soon‎‏‎‎‏‎"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%s</xliff:g>‎‏‎‎‏‏‏‎ remaining‎‏‎‎‏‎"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%s</xliff:g>‎‏‎‎‏‏‏‎ remaining, about ‎‏‎‎‏‏‎<xliff:g id="TIME">%s</xliff:g>‎‏‎‎‏‏‏‎ left based on your usage‎‏‎‎‏‎"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%s</xliff:g>‎‏‎‎‏‏‏‎ remaining, about ‎‏‎‎‏‏‎<xliff:g id="TIME">%s</xliff:g>‎‏‎‎‏‏‏‎ left‎‏‎‎‏‎"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ remaining, about ‎‏‎‎‏‏‎<xliff:g id="TIME">%2$s</xliff:g>‎‏‎‎‏‏‏‎ left based on your usage‎‏‎‎‏‎"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ remaining, about ‎‏‎‎‏‏‎<xliff:g id="TIME">%2$s</xliff:g>‎‏‎‎‏‏‏‎ left‎‏‎‎‏‎"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%s</xliff:g>‎‏‎‎‏‏‏‎ remaining. Battery Saver is on.‎‏‎‎‏‎"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎Can\'t charge via USB. Use the charger that came with your device.‎‏‎‎‏‎"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎Can\'t charge via USB‎‏‎‎‏‎"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎Location requests active‎‏‎‎‏‎"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎Clear all notifications.‎‏‎‎‏‎"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎+ ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>‎‏‎‎‏‏‏‎, +‎‏‎‎‏‏‎<xliff:g id="OVERFLOW">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>‎‏‎‎‏‏‏‎, +‎‏‎‎‏‏‎<xliff:g id="OVERFLOW">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER_1">%s</xliff:g>‎‏‎‎‏‏‏‎ more notifications inside.‎‏‎‎‏‎</item>
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER_0">%s</xliff:g>‎‏‎‎‏‏‏‎ more notification inside.‎‏‎‎‏‎</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎Total‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎silence‎‏‎‎‏‎"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎Priority‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎only‎‏‎‎‏‎"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎Alarms‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎only‎‏‎‎‏‎"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%2$s</xliff:g>‎‏‎‎‏‏‏‎ • Charging (‎‏‎‎‏‏‎<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>‎‏‎‎‏‏‏‎ until full)‎‏‎‎‏‎"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%2$s</xliff:g>‎‏‎‎‏‏‏‎ • Charging rapidly (‎‏‎‎‏‏‎<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>‎‏‎‎‏‏‏‎ until full)‎‏‎‎‏‎"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%2$s</xliff:g>‎‏‎‎‏‏‏‎ • Charging slowly (‎‏‎‎‏‏‎<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>‎‏‎‎‏‏‏‎ until full)‎‏‎‎‏‎"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%2$s</xliff:g>‎‏‎‎‏‏‏‎ • Charging (‎‏‎‎‏‏‎<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ until full)‎‏‎‎‏‎"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%2$s</xliff:g>‎‏‎‎‏‏‏‎ • Charging rapidly (‎‏‎‎‏‏‎<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ until full)‎‏‎‎‏‎"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%2$s</xliff:g>‎‏‎‎‏‏‏‎ • Charging slowly (‎‏‎‎‏‏‎<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ until full)‎‏‎‎‏‎"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎Switch user‎‏‎‎‏‎"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎Switch user, current user ‎‏‎‎‏‏‎<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎Current user ‎‏‎‎‏‏‎<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -426,6 +426,11 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎LOGOUT USER‎‏‎‎‏‎"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎Add new user?‎‏‎‎‏‎"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎When you add a new user, that person needs to set up their space.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Any user can update apps for all other users.‎‏‎‎‏‎"</string>
+    <string name="user_limit_reached_title" msgid="7374910700117359177">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎User limit reached‎‏‎‎‏‎"</string>
+    <plurals name="user_limit_reached_message" formatted="false" msgid="1855040563671964242">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎You can add up to ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ users.‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎Only one user can be created.‎‏‎‎‏‎</item>
+    </plurals>
     <string name="user_remove_user_title" msgid="4681256956076895559">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎Remove user?‎‏‎‎‏‎"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎All apps and data of this user will be deleted.‎‏‎‎‏‎"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎Remove‎‏‎‎‏‎"</string>
@@ -729,6 +734,7 @@
     <string name="left_icon" msgid="3096287125959387541">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎Left icon‎‏‎‎‏‎"</string>
     <string name="right_icon" msgid="3952104823293824311">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎Right icon‎‏‎‎‏‎"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎Hold and drag to add tiles‎‏‎‎‏‎"</string>
+    <string name="drag_to_rearrange_tiles" msgid="4566074720193667473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎Hold and drag to rearrange tiles‎‏‎‎‏‎"</string>
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎Drag here to remove‎‏‎‎‏‎"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎You need at least 6 tiles‎‏‎‎‏‎"</string>
     <string name="qs_edit" msgid="2232596095725105230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎Edit‎‏‎‎‏‎"</string>
@@ -757,12 +763,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎Bottom full screen‎‏‎‎‏‎"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎Position ‎‏‎‎‏‏‎<xliff:g id="POSITION">%1$d</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="TILE_NAME">%2$s</xliff:g>‎‏‎‎‏‏‏‎. Double tap to edit.‎‏‎‎‏‎"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="TILE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎. Double tap to add.‎‏‎‎‏‎"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎Position ‎‏‎‎‏‏‎<xliff:g id="POSITION">%1$d</xliff:g>‎‏‎‎‏‏‏‎. Double tap to select.‎‏‎‎‏‎"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎Move ‎‏‎‎‏‏‎<xliff:g id="TILE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎Remove ‎‏‎‎‏‏‎<xliff:g id="TILE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="TILE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is added to position ‎‏‎‎‏‏‎<xliff:g id="POSITION">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="TILE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is removed‎‏‎‎‏‎"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="TILE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ moved to position ‎‏‎‎‏‏‎<xliff:g id="POSITION">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎Add ‎‏‎‎‏‏‎<xliff:g id="TILE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to position ‎‏‎‎‏‏‎<xliff:g id="POSITION">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎Move ‎‏‎‎‏‏‎<xliff:g id="TILE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to position ‎‏‎‎‏‏‎<xliff:g id="POSITION">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎Quick settings editor.‎‏‎‎‏‎"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ notification: ‎‏‎‎‏‏‎<xliff:g id="ID_2">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎App may not work with split-screen.‎‏‎‎‏‎"</string>
@@ -823,7 +827,7 @@
     <string name="app_info" msgid="6856026610594615344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎App info‎‏‎‎‏‎"</string>
     <string name="go_to_web" msgid="2650669128861626071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎Go to browser‎‏‎‎‏‎"</string>
     <string name="mobile_data" msgid="7094582042819250762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎Mobile data‎‏‎‎‏‎"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="ID_1">%s</xliff:g>‎‏‎‎‏‏‏‎ — ‎‏‎‎‏‏‎<xliff:g id="ID_2">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ — ‎‏‎‎‏‏‎<xliff:g id="ID_2">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎Wi-Fi is off‎‏‎‎‏‎"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎Bluetooth is off‎‏‎‎‏‎"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎Do Not Disturb is off‎‏‎‎‏‎"</string>
diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml
index 6681dbb..f5587fe 100644
--- a/packages/SystemUI/res/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notificaciones"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Es posible que pronto se agote la batería"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g> de batería."</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Batería: <xliff:g id="PERCENTAGE">%s</xliff:g> (tiempo restante aproximado según tu uso: <xliff:g id="TIME">%s</xliff:g>)"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Batería: <xliff:g id="PERCENTAGE">%s</xliff:g> (tiempo restante aproximado: <xliff:g id="TIME">%s</xliff:g>)"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Batería: <xliff:g id="PERCENTAGE">%1$s</xliff:g> (tiempo restante aproximado según tu uso: <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Batería: <xliff:g id="PERCENTAGE">%1$s</xliff:g> (tiempo restante aproximado: <xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Queda <xliff:g id="PERCENTAGE">%s</xliff:g> de batería. El Ahorro de batería está activado."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"No se puede cargar mediante USB. Usa el cargador que se incluyó con el dispositivo."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"No se puede cargar mediante USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de ubicación activas"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Eliminar todas las notificaciones"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> más"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> (+<xliff:g id="OVERFLOW">%s</xliff:g>)"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (+<xliff:g id="OVERFLOW">%2$s</xliff:g>)"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notificaciones más en el grupo.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notificación más en el grupo.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Silencio\ntotal"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Solo\nprioridad"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Solo\nalarmas"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para completar)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando rápido (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para completar)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando lento (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para completar)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> para completar)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando rápido (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> para completar)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando lento (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> para completar)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Cambiar usuario"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Cambiar de usuario (usuario actual: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"El usuario actual es <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"SALIR DE SESIÓN DEL USUARIO"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"¿Agregar usuario nuevo?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Cuando agregas un nuevo usuario, esa persona debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de los usuarios."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"¿Confirmas que quieres quitar el usuario?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Se borrarán todas las aplicaciones y los datos de este usuario."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Quitar"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ícono izquierdo"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ícono derecho"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Mantén presionado para agregar mosaicos"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrastra aquí para quitar"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Necesitas al menos 6 mosaicos"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Editar"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Pantalla inferior completa"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posición <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Presiona dos veces para editarla."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Presiona dos veces para agregarlo."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posición <xliff:g id="POSITION">%1$d</xliff:g>. Presiona dos veces para seleccionarla."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Mover <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Quitar <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Se agregó <xliff:g id="TILE_NAME">%1$s</xliff:g> a la posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Se quitó <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Se movió <xliff:g id="TILE_NAME">%1$s</xliff:g> a la posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Agregar <xliff:g id="TILE_NAME">%1$s</xliff:g> a la posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Mover <xliff:g id="TILE_NAME">%1$s</xliff:g> a la posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor de Configuración rápida"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notificación de <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Es posible que la app no funcione en el modo de pantalla dividida."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Información de apps"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Ir al navegador"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Datos móviles"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi desactivado"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth desactivado"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"No interrumpir desactivado"</string>
diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml
index 27daa5c..e78e130 100644
--- a/packages/SystemUI/res/values-es/strings.xml
+++ b/packages/SystemUI/res/values-es/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notificaciones"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Es posible que te quedes sin batería pronto"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g> de batería"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g> (tiempo restante aproximado según tu uso: <xliff:g id="TIME">%s</xliff:g>)"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g> (tiempo restante aproximado: <xliff:g id="TIME">%s</xliff:g>)"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Queda un <xliff:g id="PERCENTAGE">%1$s</xliff:g> (tiempo restante aproximado según tu uso: <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Queda un <xliff:g id="PERCENTAGE">%1$s</xliff:g> (tiempo restante aproximado: <xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g> de batería. Se ha activado la función Ahorro de energía."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"No se puede cargar por USB. Utiliza el cargador original incluido con el dispositivo."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"No se puede cargar por USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de ubicación activas"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Borrar todas las notificaciones"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> más"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> (+ <xliff:g id="OVERFLOW">%s</xliff:g>)"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (+ <xliff:g id="OVERFLOW">%2$s</xliff:g>)"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notificaciones más dentro.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notificación más dentro.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Silencio\ntotal"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Solo\ncon prioridad"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Solo\nalarmas"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para carga completa)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga rápida (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para carga completa)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga lenta (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para carga completa)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> para carga completa)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga rápida (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> para carga completa)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga lenta (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> para carga completa)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Cambiar de usuario"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Cambiar de usuario (usuario actual <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Usuario actual: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"SALIR DE USUARIO"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"¿Añadir nuevo usuario?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Al añadir un nuevo usuario, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"¿Quitar usuario?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Se eliminarán todas las aplicaciones y todos los datos de este usuario."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Quitar"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Icono a la izquierda"</string>
     <string name="right_icon" msgid="3952104823293824311">"Icono a la derecha"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Pulsa y arrastra para añadir funciones"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrastra aquí para quitar una función"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Necesitas 6 mosaicos como mínimo"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Editar"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Pantalla inferior completa"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posición <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Toca dos veces para cambiarla."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Toca dos veces para añadirlo."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posición <xliff:g id="POSITION">%1$d</xliff:g>. Toca dos veces para seleccionarla."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Mover <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Quitar <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> se ha añadido a la posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> se ha quitado"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> se ha movido a la posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Añadir <xliff:g id="TILE_NAME">%1$s</xliff:g> a la posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Mover <xliff:g id="TILE_NAME">%1$s</xliff:g> a la posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor de ajustes rápidos."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notificación de <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Es posible que la aplicación no funcione con la pantalla dividida."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Información de la aplicación"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Ir al navegador"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Datos móviles"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> ‑ <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> ‑ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi desactivado"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth desactivado"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"No molestar está desactivado"</string>
diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml
index c309294..68cb738 100644
--- a/packages/SystemUI/res/values-et/strings.xml
+++ b/packages/SystemUI/res/values-et/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Märguanded"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Aku võib peagi tühjaks saada"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Jäänud on <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> on alles, teie kasutuse põhjal on jäänud umbes <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> on alles, umbes <xliff:g id="TIME">%s</xliff:g> on jäänud"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> on alles, teie kasutuse põhjal on jäänud umbes <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> on alles, umbes <xliff:g id="TIME">%2$s</xliff:g> on jäänud"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Jäänud on <xliff:g id="PERCENTAGE">%s</xliff:g>. Akusäästja on sisse lülitatud."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Ei saa USB kaudu laadida. Kasutage seadmega kaasas olnud laadijat."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Ei saa USB kaudu laadida"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Asukoha taotlused on aktiivsed"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Kustuta kõik teatised."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, üle <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, üle <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Sees on veel <xliff:g id="NUMBER_1">%s</xliff:g> märguannet.</item>
       <item quantity="one">Sees on veel <xliff:g id="NUMBER_0">%s</xliff:g> märguanne.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Täielik\nvaikus"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Ainult\nprioriteetsed"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Ainult\nalarmid"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laadimine (täislaadimiseks kulub <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Kiirlaadim. (täislaadimiseks kulub <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Aegl. laad. (täislaadimiseks kulub <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laadimine (täislaadimiseks kulub <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Kiirlaadim. (täislaadimiseks kulub <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Aegl. laad. (täislaadimiseks kulub <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Kasutaja vahetamine"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Kasutaja vahetamine, praegune kasutaja: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Praegune kasutaja <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"LOGI KASUTAJA VÄLJA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Kas lisada uus kasutaja?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Kui lisate uue kasutaja, siis peab ta seadistama oma ruumi.\n\nIga kasutaja saab värskendada rakendusi kõigi kasutajate jaoks."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Kas eemaldada kasutaja?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Kasutaja kõik rakendused ja andmed kustutatakse."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Eemalda"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Vasak ikoon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Parem ikoon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Paanide lisamiseks hoidke all ja lohistage"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Lohistage eemaldamiseks siia"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Teil on vaja vähemalt kuut paani"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Muutmine"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Alumine täisekraan"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Asend <xliff:g id="POSITION">%1$d</xliff:g>, paan <xliff:g id="TILE_NAME">%2$s</xliff:g>. Topeltpuudutage muutmiseks."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Topeltpuudutage lisamiseks."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Asend <xliff:g id="POSITION">%1$d</xliff:g>. Topeltpuudutage valimiseks."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Paani <xliff:g id="TILE_NAME">%1$s</xliff:g> teisaldamine"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Paani <xliff:g id="TILE_NAME">%1$s</xliff:g> eemaldamine"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Paan <xliff:g id="TILE_NAME">%1$s</xliff:g> lisati asendisse <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Paan <xliff:g id="TILE_NAME">%1$s</xliff:g> eemaldati"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Paan <xliff:g id="TILE_NAME">%1$s</xliff:g> teisaldati asendisse <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Lisage <xliff:g id="TILE_NAME">%1$s</xliff:g> asendisse <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Teisaldage <xliff:g id="TILE_NAME">%1$s</xliff:g> asendisse <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Kiirseadete redigeerija."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Teenuse <xliff:g id="ID_1">%1$s</xliff:g> märguanne: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Rakendus ei pruugi poolitatud ekraaniga töötada."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Rakenduse teave"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Ava brauser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobiilne andmeside"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"WiFi on välja lülitatud"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth on välja lülitatud"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Funktsioon Mitte segada on välja lülitatud"</string>
diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml
index d2dbc79..e203b76 100644
--- a/packages/SystemUI/res/values-eu/strings.xml
+++ b/packages/SystemUI/res/values-eu/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Jakinarazpenak"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Laster agortuko da bateria"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> gelditzen da"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> gelditzen da; <xliff:g id="TIME">%s</xliff:g> inguru gelditzen dira, erabileraren arabera"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> gelditzen da; <xliff:g id="TIME">%s</xliff:g> inguru gelditzen dira"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> gelditzen da; <xliff:g id="TIME">%2$s</xliff:g> inguru gelditzen dira, erabileraren arabera"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> gelditzen da; <xliff:g id="TIME">%2$s</xliff:g> inguru gelditzen dira"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> gelditzen da. Bateria-aurrezlea aktibatuta dago."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Ezin da USB bidez kargatu. Erabili gailuaren kargagailua."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Ezin da USB bidez kargatu"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Aplikazioen kokapen-eskaerak aktibo daude"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Garbitu jakinarazpen guztiak."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Beste <xliff:g id="NUMBER_1">%s</xliff:g> jakinarazpen daude barnean.</item>
       <item quantity="one">Beste <xliff:g id="NUMBER_0">%s</xliff:g> jakinarazpen daude barnean.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Isiltasun\nosoa"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Lehentasunezkoak\nsoilik"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alarmak\nsoilik"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Kargatzen (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> guztiz kargatzeko)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Bizkor kargatzen (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> guztiz kargatzeko)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mantso kargatzen (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> guztiz kargatzeko)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Kargatzen (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> guztiz kargatzeko)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Bizkor kargatzen (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> guztiz kargatzeko)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mantso kargatzen (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> guztiz kargatzeko)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Aldatu erabiltzailea"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Aldatu erabiltzailez. <xliff:g id="CURRENT_USER_NAME">%s</xliff:g> da saioa hasita duena."</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Uneko erabiltzailea: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"AMAITU ERABILTZAILEAREN SAIOA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Beste erabiltzaile bat gehitu?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Erabiltzaile bat gehitzen duzunean, horrek bere eremua konfiguratu beharko du.\n\nEdozein erabiltzailek egunera ditzake beste erabiltzaile guztien aplikazioak."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Erabiltzailea kendu nahi duzu?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Erabiltzailearen aplikazio eta datu guztiak ezabatuko dira."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Kendu"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ezkerreko ikonoa"</string>
     <string name="right_icon" msgid="3952104823293824311">"Eskuineko ikonoa"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Eduki sakatuta eta arrastatu lauzak gehitzeko"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Kentzeko, arrastatu hona"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Gutxienez sei lauza behar dituzu"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Editatu"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Ezarri behealdea pantaila osoan"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g>. posizioa, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Editatzeko, sakatu birritan."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Gehitzeko, sakatu birritan."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g>. posizioa. Hautatzeko, sakatu birritan."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Mugitu <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Kendu <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> gehitu da <xliff:g id="POSITION">%2$d</xliff:g>. posizioan"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Kendu da <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g>. posiziora eraman da"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Gehitu <xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g>garren postuan"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Eraman <xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g>garren postura"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Ezarpen bizkorren editorea."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> zerbitzuaren jakinarazpena: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Baliteke aplikazioak ez funtzionatzea pantaila zatituan."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Aplikazioari buruzko informazioa"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Joan arakatzailera"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Datu-konexioa"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi konexioa desaktibatuta dago"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth konexioa desaktibatuta dago"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\"Ez molestatu\" modua desaktibatuta dago"</string>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index db393c0..62bb59f 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"اعلان‌ها"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ممکن است باتری به‌زودی تمام شود"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی مانده است"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی مانده، براساس میزان مصرف شما حدود <xliff:g id="TIME">%s</xliff:g> باقی مانده است"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی مانده، حدود <xliff:g id="TIME">%s</xliff:g> باقی مانده است"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> باقی مانده، براساس میزان مصرف شما حدود <xliff:g id="TIME">%2$s</xliff:g> باقی مانده است"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> باقی مانده، حدود <xliff:g id="TIME">%2$s</xliff:g> باقی مانده است"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی مانده است. بهینه‌سازی باتری روشن است."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"‏ازطریق USB شارژ نمی‌شود. از شارژر ارائه‌شده با دستگاه استفاده کنید."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"‏ازطریق USB شارژ نمی‌شود"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"درخواست‌های موقعیت مکانی فعال است"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"پاک کردن تمام اعلان‌ها"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>، +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>، +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> اعلان دیگر در گروه.</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> اعلان دیگر در گروه.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"سکوت\nکامل"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"فقط\nاولویت‌دار"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"فقط\nهشدارها"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • درحال شارژ شدن (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> تا شارژ کامل)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • درحال شارژ سریع (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> تا شارژ کامل)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • درحال شارژ آهسته (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> تا شارژ کامل)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • درحال شارژ شدن (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> تا شارژ کامل)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • درحال شارژ سریع (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> تا شارژ کامل)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • درحال شارژ آهسته (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> تا شارژ کامل)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"تغییر کاربر"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"تعویض کاربر، کاربر کنونی <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"کاربر کنونی <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"خروج کاربر از سیستم"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"کاربر جدیدی اضافه می‌کنید؟"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"وقتی کاربر جدیدی اضافه می‌کنید آن فرد باید فضای خودش را تنظیم کند.\n\nهر کاربری می‌تواند برنامه‌ها را برای همه کاربران دیگر به‌روزرسانی کند."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"کاربر حذف شود؟"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"همه برنامه‌ها و داده‌های این کاربر حذف می‌شود."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"حذف"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"نماد چپ"</string>
     <string name="right_icon" msgid="3952104823293824311">"نماد راست"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"نگه‌داشتن و کشیدن برای افزودن کاشی"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"برای حذف، به اینجا بکشید"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"حداقل به ۶ کاشی نیاز دارید"</string>
     <string name="qs_edit" msgid="2232596095725105230">"ویرایش"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"تمام‌صفحه پایین"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"موقعیت <xliff:g id="POSITION">%1$d</xliff:g>، <xliff:g id="TILE_NAME">%2$s</xliff:g>. برای ویرایش دو ضربه سریع بزنید."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. برای افزودن دو ضربه سریع بزنید."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"موقعیت <xliff:g id="POSITION">%1$d</xliff:g>. برای انتخاب دو ضربه سریع بزنید."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"انتقال <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"حذف <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> به موقعیت <xliff:g id="POSITION">%2$d</xliff:g> اضافه می‌شود"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> حذف می‌شود"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> به موقعیت <xliff:g id="POSITION">%2$d</xliff:g> منتقل شد"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"افزودن <xliff:g id="TILE_NAME">%1$s</xliff:g> به موقعیت <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"انتقال <xliff:g id="TILE_NAME">%1$s</xliff:g> به موقعیت <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ویرایشگر تنظیمات سریع."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"اعلان <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"ممکن است برنامه با تقسیم صفحه کار نکند."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"اطلاعات برنامه"</string>
     <string name="go_to_web" msgid="2650669128861626071">"رفتن به مرورگر"</string>
     <string name="mobile_data" msgid="7094582042819250762">"داده تلفن همراه"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"‏Wi-Fi خاموش است"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"بلوتوث خاموش است"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"«مزاحم نشوید» خاموش است"</string>
diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml
index baa7822..330f7d6 100644
--- a/packages/SystemUI/res/values-fi/strings.xml
+++ b/packages/SystemUI/res/values-fi/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Ilmoitukset"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Akku voi loppua pian"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> jäljellä"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> käytettävissä, noin <xliff:g id="TIME">%s</xliff:g> jäljellä käytön perusteella"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> käytettävissä, noin <xliff:g id="TIME">%s</xliff:g> jäljellä"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> käytettävissä, noin <xliff:g id="TIME">%2$s</xliff:g> jäljellä käytön perusteella"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> käytettävissä, noin <xliff:g id="TIME">%2$s</xliff:g> jäljellä"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> jäljellä. Virransäästö on käytössä."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Lataaminen USB:llä ei onnistu. Käytä laitteesi mukana tullutta laturia."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Lataaminen USB:llä ei onnistu"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Sijaintipyynnöt aktiiviset"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Tyhjennä kaikki ilmoitukset."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">+<xliff:g id="NUMBER_1">%s</xliff:g> ilmoitusta ryhmässä</item>
       <item quantity="one">+<xliff:g id="NUMBER_0">%s</xliff:g> ilmoitus ryhmässä</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Täydellinen\nhiljaisuus"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Vain\ntärkeät"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Vain\nherätykset"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ladataan (täynnä <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> päästä)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ladataan nopeasti (täynnä <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> päästä)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ladataan hitaasti (täynnä <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> päästä)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ladataan (täynnä <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> päästä)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ladataan nopeasti (täynnä <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> päästä)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ladataan hitaasti (täynnä <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> päästä)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Vaihda käyttäjää"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Vaihda käyttäjä (nyt <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Nykyinen käyttäjä: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"KIRJAA KÄYTTÄJÄ ULOS"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Lisätäänkö uusi käyttäjä?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Kun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää sovelluksia muille käyttäjille."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Poistetaanko käyttäjä?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Kaikki käyttäjän tiedot ja sovellukset poistetaan."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Poista"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Vasen kuvake"</string>
     <string name="right_icon" msgid="3952104823293824311">"Oikea kuvake"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Lisää osioita koskettamalla pitkään ja vetämällä"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Poista vetämällä tähän."</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Kuusi osiota on vähimmäismäärä."</string>
     <string name="qs_edit" msgid="2232596095725105230">"Muokkaa"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Alaosa koko näytölle"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Paikka <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Muokkaa kaksoisnapauttamalla."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Lisää kaksoisnapauttamalla."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Paikka <xliff:g id="POSITION">%1$d</xliff:g>. Valitse kaksoisnapauttamalla."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Siirrä <xliff:g id="TILE_NAME">%1$s</xliff:g>."</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Poista <xliff:g id="TILE_NAME">%1$s</xliff:g>."</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> lisättiin paikkaan <xliff:g id="POSITION">%2$d</xliff:g>."</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> poistettiin."</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> siirrettiin paikkaan <xliff:g id="POSITION">%2$d</xliff:g>."</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Siirrä <xliff:g id="TILE_NAME">%1$s</xliff:g> kohtaan <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Siirrä <xliff:g id="TILE_NAME">%1$s</xliff:g> kohtaan <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Pika-asetusten muokkausnäkymä"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Ilmoitus kohteesta <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Sovellus ei ehkä toimi jaetulla näytöllä."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Sovelluksen tiedot"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Siirry selaimeen"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobiilitiedonsiirto"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi on pois käytöstä"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth ei ole käytössä"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Älä häiritse ‑tila on pois käytöstä"</string>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml
index bb4cdfb..47430ba 100644
--- a/packages/SystemUI/res/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res/values-fr-rCA/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifications"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"La pile sera bientôt épuisée"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> restants"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Il reste <xliff:g id="PERCENTAGE">%s</xliff:g>, environ <xliff:g id="TIME">%s</xliff:g> en fonction de votre usage"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Il reste <xliff:g id="PERCENTAGE">%s</xliff:g>, environ <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Il reste <xliff:g id="PERCENTAGE">%1$s</xliff:g>, environ <xliff:g id="TIME">%2$s</xliff:g> en fonction de votre usage"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Il reste <xliff:g id="PERCENTAGE">%1$s</xliff:g>, environ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> restants. La fonction Économie d\'énergie est activée."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Impossible de charger l\'appareil par USB. Servez-vous du chargeur fourni avec celui-ci."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Impossible de charger l\'appareil par USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Demandes de localisation actives"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Supprimer toutes les notifications"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, + <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, + <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> autre notification à l\'intérieur.</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> autres notifications à l\'intérieur.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Aucune\ninterruption"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Priorités\nuniquement"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alarmes\nuniquement"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"En recharge : <xliff:g id="PERCENTAGE">%2$s</xliff:g> (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> jusqu\'à charge complète)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"En recharge rapide : <xliff:g id="PERCENTAGE">%2$s</xliff:g> (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> jusqu\'à ch. comp.)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"En recharge lente : <xliff:g id="PERCENTAGE">%2$s</xliff:g> (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> jusqu\'à ch. comp.)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"En recharge : <xliff:g id="PERCENTAGE">%2$s</xliff:g> (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> jusqu\'à charge complète)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"En recharge rapide : <xliff:g id="PERCENTAGE">%2$s</xliff:g> (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> jusqu\'à ch. comp.)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"En recharge lente : <xliff:g id="PERCENTAGE">%2$s</xliff:g> (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> jusqu\'à ch. comp.)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Changer d\'utilisateur"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Changer d\'utilisateur (utilisateur actuel <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Utilisateur actuel : <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"DÉCONNECTER L\'UTILISATEUR"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Ajouter un utilisateur?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nTout utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Supprimer l\'utilisateur?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Toutes les applications et les données de cet utilisateur seront supprimées."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Supprimer"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Icône à gauche"</string>
     <string name="right_icon" msgid="3952104823293824311">"Icône droite"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Maint. doigt sur écran, puis glissez-le pour aj. des tuiles"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Faites glisser les tuiles ici pour les supprimer"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Vous avez besoin d\'au moins six tuiles"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Modifier"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Plein écran dans le bas"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Touchez deux fois pour modifier."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Touchez deux fois pour ajouter."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Position : <xliff:g id="POSITION">%1$d</xliff:g>. Touchez deux fois pour sélectionner."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Déplacer <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Supprimer <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> a été ajouté à la position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> a été supprimé"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> a été déplacé à la position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Ajouter <xliff:g id="TILE_NAME">%1$s</xliff:g> à la position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Déplacer <xliff:g id="TILE_NAME">%1$s</xliff:g> à la position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Éditeur de paramètres rapides."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notification <xliff:g id="ID_1">%1$s</xliff:g> : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Il est possible que l\'application ne fonctionne pas en mode Écran partagé."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Détails de l\'application"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Ouvrir le navigateur"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Données cellulaires"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> : <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Le Wi-Fi est désactivé"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Le Bluetooth est désactivé"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Le mode Ne pas déranger est désactivé"</string>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index 532fe50..c10c1d2 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifications"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Il est possible que vous soyez bientôt à court de batterie"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> restants"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> – Temps restant en fonction de votre utilisation : environ <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> – Temps restant : environ <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> – Temps restant en fonction de votre utilisation : environ <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> – Temps restant : environ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> restants. L\'économiseur de batterie est activé."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Chargement par USB impossible. Utiliser le chargeur d\'origine fourni avec votre appareil."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Impossible de recharger via USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Demandes de localisation actives"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Supprimer toutes les notifications"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> autres"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> + <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> + <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> autre notification à l\'intérieur.</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> autres notifications à l\'intérieur.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Aucune\ninterruption"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Priorité\nuniquement"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alarmes\nuniquement"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Rechargement… (rechargé à 100 %% dans <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Rechargement rapide… (à 100 %% dans <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Rechargement lent… (à 100 %% dans <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Rechargement… (rechargé à 100 %% dans <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Rechargement rapide… (à 100 %% dans <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Rechargement lent… (à 100 %% dans <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Changer d\'utilisateur"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Changer d\'utilisateur (utilisateur actuel : <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Utilisateur actuel : <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"DÉCONNECTER L\'UTILISATEUR"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Ajouter un utilisateur ?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Supprimer l\'utilisateur ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Toutes les applications et les données de cet utilisateur seront supprimées."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Supprimer"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Icône gauche"</string>
     <string name="right_icon" msgid="3952104823293824311">"Icône droite"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Sélectionnez et faites glisser les tuiles pour les ajouter"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Faites glisser les tuiles ici pour les supprimer."</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Au minimum six tuiles sont nécessaires"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Modifier"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Écran du bas en plein écran"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, \"<xliff:g id="TILE_NAME">%2$s</xliff:g>\". Appuyer deux fois pour modifier."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Appuyer deux fois pour ajouter."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Position <xliff:g id="POSITION">%1$d</xliff:g>. Appuyer deux fois pour sélectionner."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Déplacer \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\""</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Supprimer \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Le bloc \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" a bien été ajouté à la position <xliff:g id="POSITION">%2$d</xliff:g>."</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Le bloc \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" a bien été supprimé."</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Le bloc \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" a bien été déplacé à la position <xliff:g id="POSITION">%2$d</xliff:g>."</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Ajouter l\'élément \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" à la position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Déplacer l\'élément \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" à la position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Éditeur de configuration rapide."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notification <xliff:g id="ID_1">%1$s</xliff:g> : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Il est possible que l\'application ne fonctionne pas en mode Écran partagé."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Infos sur l\'appli"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Accéder au navigateur"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Données mobiles"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi désactivé"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth désactivé"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Mode \"Ne pas déranger\" désactivé"</string>
diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml
index 0e8b093..5c6737f 100644
--- a/packages/SystemUI/res/values-gl/strings.xml
+++ b/packages/SystemUI/res/values-gl/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notificacións"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"A batería pode esgotarse en breve"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g>, é dicir, aproximadamente <xliff:g id="TIME">%s</xliff:g> en función do uso que fas"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g>, é dicir, aproximadamente <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Queda un <xliff:g id="PERCENTAGE">%1$s</xliff:g>, é dicir, aproximadamente <xliff:g id="TIME">%2$s</xliff:g> en función do uso que fas"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Queda un <xliff:g id="PERCENTAGE">%1$s</xliff:g>, é dicir, aproximadamente <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante. Está activada a función Aforro de batería."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Non se puido realizar a carga por USB. Utiliza o cargador que incluía o dispositivo."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Non se puido realizar a carga por USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de localización activas"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Eliminar todas as notificacións."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> máis"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> (+<xliff:g id="OVERFLOW">%s</xliff:g>)"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (+<xliff:g id="OVERFLOW">%2$s</xliff:g>)"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notificacións máis no grupo.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notificación máis no grupo.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Silencio\ntotal"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Só\nprioridade"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Só\nalarmas"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para rematar a carga)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando rapidamente (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para rematar a carga)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando lentamente (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para rematar a carga)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> para rematar a carga)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando rapidamente (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> para rematar a carga)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Cargando lentamente (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> para rematar a carga)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Cambiar usuario"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Cambiar usuario, usuario actual: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Usuario actual <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"PECHAR SESIÓN DO USUARIO"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Engadir un usuario novo?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Cando engadas un usuario novo, este deberá configurar o seu espazo\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Queres eliminar o usuario?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Eliminaranse todas as aplicacións e os datos deste usuario."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Eliminar"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Icona á esquerda"</string>
     <string name="right_icon" msgid="3952104823293824311">"Icona á dereita"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Mantén premidas as funcións e arrástraas para engadilas"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrastra o elemento ata aquí para eliminalo"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Necesitas polo menos 6 mosaicos"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Editar"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Pantalla completa abaixo"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posición <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Toca dúas veces o elemento para editalo."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Toca dúas veces o elemento para engadilo"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posición <xliff:g id="POSITION">%1$d</xliff:g>. Toca dúas veces o elemento para seleccionalo."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Elimina <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> engadiuse á posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Eliminouse <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> moveuse á posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Engadir \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" á posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Mover \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" á posición <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor de configuración rápida."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notificación de <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Pode que a aplicación non funcione coa pantalla dividida."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Info. da aplicación"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Ir ao navegador"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Datos móbiles"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g>-<xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g>-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"A wifi está desactivada"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"O Bluetooth está desactivado"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"O modo Non molestar está desactivado"</string>
diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml
index a730f01..76e00d4 100644
--- a/packages/SystemUI/res/values-gu/strings.xml
+++ b/packages/SystemUI/res/values-gu/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"નોટિફિકેશનો"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"બૅટરી ટૂંક સમયમાં સમાપ્ત થશે"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> બાકી"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> બાકી, તમારા વપરાશના આધારે લગભગ <xliff:g id="TIME">%s</xliff:g> બાકી છે"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> બાકી, લગભગ <xliff:g id="TIME">%s</xliff:g> બાકી"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> બાકી, તમારા વપરાશના આધારે લગભગ <xliff:g id="TIME">%2$s</xliff:g> બાકી છે"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> બાકી, લગભગ <xliff:g id="TIME">%2$s</xliff:g> બાકી"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> બાકી. બૅટરી સેવર ચાલુ છે."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB મારફતે ચાર્જ કરી શકતા નથી. તમારા ઉપકરણ સાથે આવેલ ચાર્જરનો ઉપયોગ કરો."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB મારફતે ચાર્જ કરી શકતા નથી"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"સ્થાન વિનંતીઓ સક્રિય"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"બધા સૂચનો સાફ કરો."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> વધુ સૂચના અંદર છે.</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> વધુ સૂચના અંદર છે.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"સાવ\nશાંતિ"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"ફક્ત\nપ્રાધાન્યતા"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"ફક્ત\nએલાર્મ્સ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ચાર્જિંગ (પૂર્ણ થવામાં <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> બાકી)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ઝડપથી ચાર્જિંગ (પૂર્ણ થવામાં <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> બાકી)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ધીમેથી ચાર્જિંગ (પૂર્ણ થવામાં <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> બાકી)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ચાર્જિંગ (પૂર્ણ થવામાં <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> બાકી)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ઝડપથી ચાર્જિંગ (પૂર્ણ થવામાં <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> બાકી)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ધીમેથી ચાર્જિંગ (પૂર્ણ થવામાં <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> બાકી)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"વપરાશકર્તા સ્વિચ કરો"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"વપરાશકર્તાને સ્વિચ કરો, વર્તમાન વપરાશકર્તા <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"વર્તમાન વપરાશકર્તા <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"વપરાશકર્તાને લૉગઆઉટ કરો"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"નવા વપરાશકર્તાને ઉમેરીએ?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"જ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા બધા અન્ય વપરાશકર્તાઓ માટે એપ્લિકેશન્સને અપડેટ કરી શકે છે."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"વપરાશકર્તાને દૂર કરીએ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"આ વપરાશકર્તાની તમામ ઍપ્લિકેશનો અને ડેટા કાઢી નાખવામાં આવશે."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"દૂર કરો"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"ડાબું આઇકન"</string>
     <string name="right_icon" msgid="3952104823293824311">"જમણું આઇકન"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ટાઇલ ઉમેરવા માટે તેના પર આંગળી દબાવીને ખેંચો"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"દૂર કરવા માટે અહીં ખેંચો"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"તમને ઓછામાં ઓછી 6 ટાઇલની જરૂર છે"</string>
     <string name="qs_edit" msgid="2232596095725105230">"સંપાદિત કરો"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"તળિયાની પૂર્ણ સ્ક્રીન"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"સ્થિતિ <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. સંપાદિત કરવા માટે બે વાર ટૅપ કરો."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. ઉમેરવા માટે બે વાર ટૅપ કરો."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"સ્થિતિ <xliff:g id="POSITION">%1$d</xliff:g>. પસંદ કરવા માટે બે વાર ટૅપ કરો."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ખસેડો"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> દૂર કરો"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="POSITION">%2$d</xliff:g> સ્થિતિ પર <xliff:g id="TILE_NAME">%1$s</xliff:g> ઉમેર્યું છે"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> દૂર કરવામાં આવ્યું છે"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ને <xliff:g id="POSITION">%2$d</xliff:g> સ્થિતિ પર ખસેડ્યું"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="POSITION">%2$d</xliff:g> જગ્યા પર <xliff:g id="TILE_NAME">%1$s</xliff:g>ને ઉમેરો"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="POSITION">%2$d</xliff:g> જગ્યા પર <xliff:g id="TILE_NAME">%1$s</xliff:g>ને ખસેડો"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ઝડપી સેટિંગ્સ સંપાદક."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> નોટિફિકેશન: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"વિભાજિત-સ્ક્રીન સાથે ઍપ્લિકેશન કદાચ કામ ન કરે."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ઍપ્લિકેશન માહિતી"</string>
     <string name="go_to_web" msgid="2650669128861626071">"બ્રાઉઝર પર જાઓ"</string>
     <string name="mobile_data" msgid="7094582042819250762">"મોબાઇલ ડેટા"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"વાઇ-ફાઇ બંધ છે"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"બ્લૂટૂથ બંધ છે"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"ખલેલ પાડશો નહીં બંધ છે"</string>
diff --git a/packages/SystemUI/res/values-gu/strings_car.xml b/packages/SystemUI/res/values-gu/strings_car.xml
index e42c247..3f95205 100644
--- a/packages/SystemUI/res/values-gu/strings_car.xml
+++ b/packages/SystemUI/res/values-gu/strings_car.xml
@@ -20,8 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="car_guest" msgid="3738772168718508650">"અતિથિ"</string>
-    <!-- no translation found for start_guest_session (7055742120180595689) -->
-    <skip />
+    <string name="start_guest_session" msgid="7055742120180595689">"અતિથિ"</string>
     <string name="car_add_user" msgid="5245196248349230898">"વપરાશકર્તા ઉમેરો"</string>
     <string name="car_new_user" msgid="8142927244990323906">"નવા વપરાશકર્તા"</string>
     <string name="user_add_user_message_setup" msgid="1791011504259527329">"જ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિએ તેમની સ્પેસ સેટ કરવાની જરૂર રહે છે."</string>
diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml
index 7049044..ad8d505 100644
--- a/packages/SystemUI/res/values-hi/strings.xml
+++ b/packages/SystemUI/res/values-hi/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"सूचनाएं"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"बैटरी जल्दी ही खत्म हो जाएगी"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> शेष"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> बची है, आपके इस्तेमाल करने के तरीके के हिसाब से बैटरी लगभग <xliff:g id="TIME">%s</xliff:g> चलेगी"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> बची है, बैटरी लगभग <xliff:g id="TIME">%s</xliff:g> चलेगी"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> बची है, आपके इस्तेमाल करने के तरीके के हिसाब से बैटरी लगभग <xliff:g id="TIME">%2$s</xliff:g> चलेगी"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> बची है, बैटरी लगभग <xliff:g id="TIME">%2$s</xliff:g> चलेगी"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> बैटरी बची है. बैटरी सेवर चालू है."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"यूएसबी के ज़रिए चार्ज नहीं किया जा सकता. अपने डिवाइस के साथ मिलने वाले चार्जर का इस्तेमाल करें."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"यूएसबी के ज़रिए चार्ज नहीं किया जा सकता"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"जगह का अनुरोध किया जा रहा है"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"सभी सूचनाएं साफ़ करें."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">इसमें <xliff:g id="NUMBER_1">%s</xliff:g> और सूचनाएं हैं.</item>
       <item quantity="other">इसमें <xliff:g id="NUMBER_1">%s</xliff:g> और सूचनाएं हैं.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"पूरी तरह\nशांत"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"केवल\nप्राथमिकता"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"केवल\nअलार्म"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • चार्ज हो रहा है (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> में पूरा होगा)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • तेज़ चार्ज हो रहा है (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> में पूरा होगा)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • धीरे चार्ज हो रहा है (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> में पूरा होगा)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • चार्ज हो रहा है (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> में पूरा होगा)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • तेज़ चार्ज हो रहा है (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> में पूरा होगा)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • धीरे चार्ज हो रहा है (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> में पूरा होगा)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"उपयोगकर्ता बदलें"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"उपयोगकर्ता बदलें, मौजूदा उपयोगकर्ता <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"मौजूदा उपयोगकर्ता <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"उपयोगकर्ता को प्रस्थान करवाएं"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"नया उपयोगकर्ता जोड़ें?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"जब आप कोई नया उपयोगकर्ता जोड़ते हैं तो उस व्यक्ति को अपनी जगह सेट करनी होती है.\n\nकोई भी उपयोगकर्ता बाकी सभी उपयोगकर्ताओं के लिए ऐप्लिकेशन अपडेट कर सकता है."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"उपयोगकर्ता निकालें?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"इस उपयोगकर्ता के सभी ऐप और डेटा को हटा दिया जाएगा."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"निकालें"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"बायां आइकॉन"</string>
     <string name="right_icon" msgid="3952104823293824311">"दायां आइकॉन"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"टाइल जोड़ने के लिए दबाएं और खींचें"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"हटाने के लिए यहां खींचें और छोड़ें"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"आपके पास कम से कम 6 टाइल होनी चाहिए"</string>
     <string name="qs_edit" msgid="2232596095725105230">"बदलाव करें"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"नीचे की स्क्रीन को पूर्ण स्क्रीन बनाएं"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"स्थिति <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. में बदलाव करने के लिए दो बार छूएं."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. जोड़ने के लिए दो बार छूएं."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"स्थिति <xliff:g id="POSITION">%1$d</xliff:g>. चुनने के लिए दो बार छूएं."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> को ले जाएं"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> निकालें"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> को <xliff:g id="POSITION">%2$d</xliff:g> स्थिति में जोड़ा गया"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> निकाल दिया गया है"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> को <xliff:g id="POSITION">%2$d</xliff:g> स्थिति में ले जाया गया"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> काे क्रम संख्या <xliff:g id="POSITION">%2$d</xliff:g> पर जाेड़ें"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> काे क्रम संख्या <xliff:g id="POSITION">%2$d</xliff:g> पर ले जाएं"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"त्वरित सेटिंग संपादक."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> सूचना: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"हो सकता है कि ऐप्लिकेशन विभाजित स्क्रीन के साथ काम ना करे."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ऐप की जानकारी"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ब्राउज़र पर जाएं"</string>
     <string name="mobile_data" msgid="7094582042819250762">"मोबाइल डेटा"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"वाई-फ़ाई बंद है"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ब्लूटूथ बंद है"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"परेशान न करें बंद है"</string>
diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml
index a77b7ff..435fc56 100644
--- a/packages/SystemUI/res/values-hr/strings.xml
+++ b/packages/SystemUI/res/values-hr/strings.xml
@@ -35,8 +35,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Obavijesti"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Baterija bi se uskoro mogla isprazniti"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Preostalo <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Preostalo je <xliff:g id="PERCENTAGE">%s</xliff:g>, još otprilike <xliff:g id="TIME">%s</xliff:g> na temelju vaše upotrebe"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Preostalo je <xliff:g id="PERCENTAGE">%s</xliff:g>, još otprilike <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Preostalo je <xliff:g id="PERCENTAGE">%1$s</xliff:g>, još otprilike <xliff:g id="TIME">%2$s</xliff:g> na temelju vaše upotrebe"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Preostalo je <xliff:g id="PERCENTAGE">%1$s</xliff:g>, još otprilike <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Preostalo <xliff:g id="PERCENTAGE">%s</xliff:g>. Uključena je Štednja baterije."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Punjenje putem USB-a nije moguće. Koristite punjač koji ste dobili s uređajem."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Punjenje putem USB-a nije moguće"</string>
@@ -258,7 +258,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Zahtjevi za lokaciju aktivni su"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Brisanje svih obavijesti."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"još <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">U skupini je još <xliff:g id="NUMBER_1">%s</xliff:g> obavijest.</item>
       <item quantity="few">U skupini su još <xliff:g id="NUMBER_1">%s</xliff:g> obavijesti.</item>
@@ -402,9 +402,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Potpuna\ntišina"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Samo\nprioritetno"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Samo\nalarmi"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • punjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do napunjenosti)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • brzo punjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do napunjenosti)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • sporo punjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do napunjenosti)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • punjenje (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do napunjenosti)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • brzo punjenje (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do napunjenosti)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • sporo punjenje (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do napunjenosti)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Promjena korisnika"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Promjena korisnika, trenutačni korisnik <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Trenutačan korisnik <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -429,6 +429,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ODJAVI KORISNIKA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Dodati novog korisnika?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Kada dodate novog korisnika, ta osoba mora postaviti vlastiti prostor.\n\nBilo koji korisnik može ažurirati aplikacije za sve ostale korisnike."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Ukloniti korisnika?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Izbrisat će se sve aplikacije i podaci ovog korisnika."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Ukloni"</string>
@@ -734,6 +737,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Lijeva ikona"</string>
     <string name="right_icon" msgid="3952104823293824311">"Desna ikona"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Zadržite i povucite za dodavanje pločica"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Povucite ovdje za uklanjanje"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Potrebno je barem 6 pločica"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Uredi"</string>
@@ -762,12 +767,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Donji zaslon u cijeli zaslon"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Položaj <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Dodirnite dvaput da biste uredili."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Dodirnite dvaput da biste dodali."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Položaj <xliff:g id="POSITION">%1$d</xliff:g>. Dodirnite dvaput da biste odabrali."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Premjesti <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Ukloni <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Pločica <xliff:g id="TILE_NAME">%1$s</xliff:g> dodana je na položaj <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Pločica <xliff:g id="TILE_NAME">%1$s</xliff:g> uklonjena"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Pločica <xliff:g id="TILE_NAME">%1$s</xliff:g> premještena je na položaj <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Dodajte pločicu <xliff:g id="TILE_NAME">%1$s</xliff:g> na položaj <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Premjestite pločicu <xliff:g id="TILE_NAME">%1$s</xliff:g> na položaj <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Uređivač brzih postavki."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> obavijest: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Aplikacija možda neće funkcionirati s podijeljenim zaslonom."</string>
@@ -828,7 +831,7 @@
     <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Otvori preglednik"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobilni podaci"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi je isključen"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth je isključen"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Način Ne ometaj isključen"</string>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index d6e2cb6..6574c97 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Értesítések"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Az akkumulátor hamarosan lemerül"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> maradt"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> maradt, körülbelül <xliff:g id="TIME">%s</xliff:g> van hátra a használat alapján"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> maradt, körülbelül <xliff:g id="TIME">%s</xliff:g> van hátra"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> maradt, körülbelül <xliff:g id="TIME">%2$s</xliff:g> van hátra a használat alapján"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> maradt, körülbelül <xliff:g id="TIME">%2$s</xliff:g> van hátra"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> maradt. Az Akkumulátorkímélő mód be van kapcsolva."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Nem tölthető USB-n keresztül. Használja az eszközhöz kapott eredeti töltőt."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Nem tölthető USB-n keresztül"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Aktív helylekérések"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Minden értesítés törlése"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> további értesítés.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> további értesítés.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Teljes\nnémítás"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Csak\nprioritás"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Csak\nriasztások"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Töltés (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> a teljes töltöttségig)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Gyors töltés (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> a teljes töltöttségig)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lassú töltés (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> a teljes töltöttségig)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Töltés (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> a teljes töltöttségig)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Gyors töltés (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> a teljes töltöttségig)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lassú töltés (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> a teljes töltöttségig)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Felhasználóváltás"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Felhasználóváltás (a jelenlegi felhasználó: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Jelenlegi felhasználó (<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"FELHASZNÁLÓ KIJELENTKEZÉSE"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Új felhasználó hozzáadása?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Ha új felhasználót ad hozzá, az illetőnek be kell állítania saját tárterületét.\n\nBármely felhasználó frissítheti az alkalmazásokat valamennyi felhasználó számára."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Törli a felhasználót?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"A felhasználóhoz tartozó minden adat és alkalmazás törölve lesz."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Eltávolítás"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Bal oldali ikon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Jobb oldali ikon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Tartsa lenyomva, és húzza a mozaikok hozzáadásához"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Húzza ide az eltávolításhoz"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Legalább hat mozaik szükséges"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Szerkesztés"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Alsó teljes képernyőre"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g>. pozíció: <xliff:g id="TILE_NAME">%2$s</xliff:g>. Koppintson duplán a szerkesztéshez."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Koppintson duplán a hozzáadáshoz."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g>. pozíció. Koppintson duplán a kiválasztáshoz."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"A(z) <xliff:g id="TILE_NAME">%1$s</xliff:g> áthelyezése"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"A(z) <xliff:g id="TILE_NAME">%1$s</xliff:g> eltávolítása"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"A(z) <xliff:g id="TILE_NAME">%1$s</xliff:g> hozzáadva <xliff:g id="POSITION">%2$d</xliff:g>. pozícióban"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"A(z) <xliff:g id="TILE_NAME">%1$s</xliff:g> eltávolítva"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"A(z) <xliff:g id="TILE_NAME">%1$s</xliff:g> áthelyezve a(z) <xliff:g id="POSITION">%2$d</xliff:g>. pozícióba"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> hozzáadása a következő pozícióhoz: <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> áthelyezése a következő pozícióba: <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Gyorsbeállítások szerkesztője"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g>-értesítések: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Lehet, hogy az alkalmazás nem működik osztott képernyős nézetben."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Alkalmazásinformáció"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Ugrás a böngészőbe"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobiladatok"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"A Wi-Fi ki van kapcsolva"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"A Bluetooth ki van kapcsolva"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"A „Ne zavarjanak” mód ki van kapcsolva"</string>
diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml
index 7c0ed52..20209a2 100644
--- a/packages/SystemUI/res/values-hy/strings.xml
+++ b/packages/SystemUI/res/values-hy/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Ծանուցումներ"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Մարտկոցի լիցքը շուտով կարող է սպառվել"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Մնաց <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Մարտկոցի լիցքը՝ <xliff:g id="PERCENTAGE">%s</xliff:g>, մնացել է մոտ <xliff:g id="TIME">%s</xliff:g>՝ օգտագործման եղանակից կախված"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Մարտկոցի լիցքը՝ <xliff:g id="PERCENTAGE">%s</xliff:g>, մնացել է մոտ <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Մարտկոցի լիցքը՝ <xliff:g id="PERCENTAGE">%1$s</xliff:g>, մնացել է մոտ <xliff:g id="TIME">%2$s</xliff:g>՝ օգտագործման եղանակից կախված"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Մարտկոցի լիցքը՝ <xliff:g id="PERCENTAGE">%1$s</xliff:g>, մնացել է մոտ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Մնացել է <xliff:g id="PERCENTAGE">%s</xliff:g>: Մարտկոցի տնտեսումը միացված է:"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Հնարավոր չէ լիցքավորել USB-ի միջոցով: Օգտագործեք սարքի լիցքավորիչը:"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Սարքը հնարավոր չէ լիցքավորել USB-ի միջոցով"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Տեղադրության հարցումներն ակտիվ են"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Մաքրել բոլոր ծանուցումները:"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Ներսում ևս <xliff:g id="NUMBER_1">%s</xliff:g> ծանուցում կա:</item>
       <item quantity="other">Ներսում ևս <xliff:g id="NUMBER_1">%s</xliff:g> ծանուցում կա:</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Ընդհանուր\nլուռ վիճակը"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Միայն\nկարևորները"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Միայն\nզարթուցիչ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Լիցքավորում (մնացել է <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Արագ լիցքավորում (մնացել է <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Դանդաղ լիցքավորում (մնացել է <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Լիցքավորում (մնացել է <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Արագ լիցքավորում (մնացել է <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Դանդաղ լիցքավորում (մնացել է <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Անջատել օգտվողին"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Փոխել օգտատիրոջը. ներկայիս օգտատերն է՝ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Ընթացիկ օգտատերը՝ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ԸՆԹԱՑԻԿ ՕԳՏՎՈՂԻ ԴՈՒՐՍ ԳՐՈՒՄ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Ավելացնե՞լ նոր պրոֆիլ:"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Երբ նոր օգտատեր եք ավելացնում, նա պետք է կարգավորի իր պրոֆիլը:\n\nՑանկացած օգտատեր կարող է թարմացնել հավելվածները մյուս բոլոր հաշիվների համար:"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Հեռացնե՞լ օգտատիրոջը:"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Այս օգտատիրոջ բոլոր հավելվածներն ու տվյալները կջնջվեն:"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Հեռացնել"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ձախ պատկերակ"</string>
     <string name="right_icon" msgid="3952104823293824311">"Աջ պատկերակ"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Պահեք և քաշեք՝ սալիկներ ավելացնելու համար"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Քաշեք այստեղ՝ հեռացնելու համար"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Հարկավոր է առնվազն 6 սալիկ"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Փոփոխել"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Ներքևի էկրանը՝ լիաէկրան"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Դիրք <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>: Կրկնակի հպեք՝ փոխելու համար:"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>: Կրկնակի հպեք՝ ավելացնելու համար:"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Դիրք <xliff:g id="POSITION">%1$d</xliff:g>: Կրկնակի հպեք՝ ընտրելու համար:"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Տեղափոխել <xliff:g id="TILE_NAME">%1$s</xliff:g> սալիկը"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Հեռացնել <xliff:g id="TILE_NAME">%1$s</xliff:g> սալիկը"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> սալիկն ավելացվել է <xliff:g id="POSITION">%2$d</xliff:g> դիրքին"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> սալիկը հեռացվել է"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> սալիկը տեղափոխվել է դեպի <xliff:g id="POSITION">%2$d</xliff:g> դիրք"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Ավելացնել <xliff:g id="TILE_NAME">%1$s</xliff:g> սալիկը դիրք <xliff:g id="POSITION">%2$d</xliff:g>-ում"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> սալիկը տեղափոխել դիրք <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Արագ կարգավորումների խմբագրիչ:"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> ծանուցում՝ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Հավելվածը չի կարող աշխատել տրոհված էկրանի ռեժիմում:"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Հավելվածի տվյալներ"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Անցնել դիտարկիչ"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Բջջային ինտերնետ"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi-ն անջատված է"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth-ն անջատված է"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Չանհանգստացնելու ռեժիմն անջատված է"</string>
diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml
index d75d121..5111ed6 100644
--- a/packages/SystemUI/res/values-in/strings.xml
+++ b/packages/SystemUI/res/values-in/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifikasi"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Baterai mungkin akan segera habis"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Tersisa <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Sisa <xliff:g id="PERCENTAGE">%s</xliff:g>, kira-kira <xliff:g id="TIME">%s</xliff:g> lagi berdasarkan penggunaan Anda"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Sisa <xliff:g id="PERCENTAGE">%s</xliff:g>, kira-kira <xliff:g id="TIME">%s</xliff:g> lagi"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Sisa <xliff:g id="PERCENTAGE">%1$s</xliff:g>, kira-kira <xliff:g id="TIME">%2$s</xliff:g> lagi berdasarkan penggunaan Anda"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Sisa <xliff:g id="PERCENTAGE">%1$s</xliff:g>, kira-kira <xliff:g id="TIME">%2$s</xliff:g> lagi"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Tersisa <xliff:g id="PERCENTAGE">%s</xliff:g>. Penghemat Baterai aktif."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Tidak dapat mengisi daya melalui USB. Gunakan pengisi daya yang disertakan dengan perangkat."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Tidak dapat mengisi daya melalui USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Permintaan lokasi aktif"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Menghapus semua pemberitahuan."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notifikasi lainnya di dalam.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notifikasi lainnya di dalam.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Senyap\ntotal"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Hanya\nprioritas"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Hanya\nalarm"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengisi daya (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hingga penuh)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengisi daya dengan cepat (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hingga penuh)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengisi daya dengan lambat (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hingga penuh)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengisi daya (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> hingga penuh)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengisi daya dengan cepat (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> hingga penuh)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengisi daya dengan lambat (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> hingga penuh)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Beralih pengguna"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Ganti pengguna, pengguna saat ini <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Pengguna saat ini <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"KELUARKAN PENGGUNA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Tambahkan pengguna baru?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Saat Anda menambahkan pengguna baru, orang tersebut perlu menyiapkan ruangnya sendiri.\n\nPengguna mana pun dapat mengupdate aplikasi untuk semua pengguna lain."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Hapus pengguna?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Semua aplikasi dan data pengguna ini akan dihapus."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Hapus"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ikon kiri"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ikon kanan"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Tahan dan tarik untuk menambahkan tile"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Tarik ke sini untuk menghapus"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Anda membutuhkan setidaknya 6 tile"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Edit"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Layar penuh di bawah"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posisi <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Tap dua kali untuk mengedit."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Tap dua kali untuk menambahkan."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posisi <xliff:g id="POSITION">%1$d</xliff:g>. Tap dua kali untuk memilih."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Pindahkan <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Hapus <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ditambahkan ke posisi <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> dihapus"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> dpindahkan ke posisi <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Tambahkan <xliff:g id="TILE_NAME">%1$s</xliff:g> ke posisi <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Pindahkan <xliff:g id="TILE_NAME">%1$s</xliff:g> ke posisi <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor setelan cepat."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notifikasi <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Aplikasi mungkin tidak berfungsi dengan layar terpisah."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Info aplikasi"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Buka browser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Data seluler"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi nonaktif"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth nonaktif"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Fitur Jangan Ganggu nonaktif"</string>
diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml
index eaad622..508b2bd 100644
--- a/packages/SystemUI/res/values-is/strings.xml
+++ b/packages/SystemUI/res/values-is/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Tilkynningar"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Rafhlaðan gæti tæmst bráðlega"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> eftir"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> eftir, um það bil <xliff:g id="TIME">%s</xliff:g> eftir miðað við notkun"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> eftir, um það bil <xliff:g id="TIME">%s</xliff:g> eftir"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> eftir, um það bil <xliff:g id="TIME">%2$s</xliff:g> eftir miðað við notkun"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> eftir, um það bil <xliff:g id="TIME">%2$s</xliff:g> eftir"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> eftir. Kveikt er á rafhlöðusparnaði."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Ekki er hægt að hlaða í gegnum USB. Notaðu hleðslutækið sem fylgdi tækinu þínu."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Ekki er hægt að hlaða í gegnum USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Staðsetningarbeiðnir virkar"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Hreinsa allar tilkynningar."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> tilkynning í viðbót.</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> tilkynningar í viðbót.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Algjör\nþögn"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Aðeins\nforgangur"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Aðeins\nvekjarar"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Í hleðslu (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> fram að fullri hleðslu)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Hröð hleðsla (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> að fullri hleðslu)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Hæg hleðsla (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> fram að fullri hleðslu)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Í hleðslu (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> fram að fullri hleðslu)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Hröð hleðsla (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> að fullri hleðslu)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Hæg hleðsla (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> fram að fullri hleðslu)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Skipta um notanda"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Skipta um notanda; núverandi notandi er <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Núverandi notandi er <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"SKRÁ NOTANDA ÚT"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Bæta nýjum notanda við?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Þegar þú bætir nýjum notanda við þarf sá notandi að setja upp svæðið sitt.\n\nHvaða notandi sem er getur uppfært forrit fyrir alla aðra notendur."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Fjarlægja notandann?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Öllum forritum og gögnum þessa notanda verður eytt."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Fjarlægja"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Tákn til vinstri"</string>
     <string name="right_icon" msgid="3952104823293824311">"Tákn til hægri"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Haltu inni og dragðu til að bæta við reitum"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Dragðu hingað til að fjarlægja"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Reitirnir mega ekki vera færri en sex"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Breyta"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Neðri á öllum skjánum"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Staða <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Ýttu tvisvar til að breyta."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Ýttu tvisvar til að bæta við."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Staða <xliff:g id="POSITION">%1$d</xliff:g>. Ýttu tvisvar til að velja."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Færa <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Fjarlægja <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> er bætt við í stöðu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> var fjarlægð"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> færð í stöðu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Bæta <xliff:g id="TILE_NAME">%1$s</xliff:g> við í stöðu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Færa <xliff:g id="TILE_NAME">%1$s</xliff:g> í stöðu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Flýtistillingaritill."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> tilkynning: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Hugsanlega virkar forritið ekki ef skjánum er skipt upp."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Forritsupplýsingar"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Opna vafra"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Farsímagögn"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Slökkt á Wi-Fi"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Slökkt á Bluetooth"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Slökkt á „Ónáðið ekki“"</string>
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index 7bd52d4..467ca8d 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifiche"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"La batteria potrebbe esaurirsi a breve"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> rimanente"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante. Tempo rimanente in base al tuo utilizzo: <xliff:g id="TIME">%s</xliff:g> circa"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante. Tempo rimanente: <xliff:g id="TIME">%s</xliff:g> circa"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> restante. Tempo rimanente in base al tuo utilizzo: <xliff:g id="TIME">%2$s</xliff:g> circa"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> restante. Tempo rimanente: <xliff:g id="TIME">%2$s</xliff:g> circa"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> rimanente. Risparmio energetico attivo."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Impossibile ricaricare tramite USB. Utilizza il caricabatterie fornito in dotazione con il dispositivo."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Impossibile ricaricare tramite USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Richieste di accesso alla posizione attive"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Cancella tutte le notifiche."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Altre <xliff:g id="NUMBER_1">%s</xliff:g> notifiche nel gruppo.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> altra notifica nel gruppo.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Silenzio\ntotale"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Solo con\npriorità"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Solo\nsveglie"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • In carica (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> al termine)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ricarica veloce (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> al termine)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ricarica lenta (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> al termine)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • In carica (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> al termine)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ricarica veloce (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> al termine)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ricarica lenta (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> al termine)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Cambio utente"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Cambia utente, utente corrente <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Utente corrente <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"DISCONNETTI UTENTE"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Aggiungere un nuovo utente?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Il nuovo utente, una volta aggiunto, deve impostare il proprio spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Rimuovere l\'utente?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Tutte le app e i dati di questo utente verranno eliminati."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Rimuovi"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Icona sinistra"</string>
     <string name="right_icon" msgid="3952104823293824311">"Icona destra"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Tieni premuto e trascina per aggiungere riquadri"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Trascina qui per rimuovere"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Occorrono almeno sei riquadri"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Modifica"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Schermata inferiore a schermo intero"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posizione <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Tocca due volte per modificare."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Tocca due volte per aggiungere."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posizione <xliff:g id="POSITION">%1$d</xliff:g>. Tocca due volte per selezionare."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Sposta <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Rimuovi <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Il riquadro <xliff:g id="TILE_NAME">%1$s</xliff:g> è stato aggiunto alla posizione <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Il riquadro <xliff:g id="TILE_NAME">%1$s</xliff:g> è stato rimosso"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Il riquadro <xliff:g id="TILE_NAME">%1$s</xliff:g> è stato spostato nella posizione <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Aggiungi il riquadro <xliff:g id="TILE_NAME">%1$s</xliff:g> alla posizione <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Sposta il riquadro <xliff:g id="TILE_NAME">%1$s</xliff:g> nella posizione <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor di impostazioni rapide."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notifica di <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"L\'app potrebbe non funzionare con lo schermo diviso."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Informazioni app"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Vai al browser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Dati mobili"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi disattivato"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth non attivo"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Funzione Non disturbare disattivata"</string>
diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml
index cac6d31..46d930e 100644
--- a/packages/SystemUI/res/values-iw/strings.xml
+++ b/packages/SystemUI/res/values-iw/strings.xml
@@ -36,8 +36,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"הודעות"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ייתכן שהסוללה תתרוקן בקרוב"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"נותרו <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"נותרו <xliff:g id="PERCENTAGE">%s</xliff:g>, נשארו בערך <xliff:g id="TIME">%s</xliff:g> על סמך השימוש במכשיר"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"נותרו <xliff:g id="PERCENTAGE">%s</xliff:g>, נשארו בערך <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"נותרו <xliff:g id="PERCENTAGE">%1$s</xliff:g>, נשארו בערך <xliff:g id="TIME">%2$s</xliff:g> על סמך השימוש במכשיר"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"נותרו <xliff:g id="PERCENTAGE">%1$s</xliff:g>, נשארו בערך <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"נותרו <xliff:g id="PERCENTAGE">%s</xliff:g>. הופעלה תכונת החיסכון בסוללה."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"‏לא ניתן לטעון באמצעות USB. ניתן להשתמש במטען שצורף למכשיר שלך."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"‏לא ניתן לטעון באמצעות USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"בקשות מיקום פעילות"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"נקה את כל ההודעות."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="two">יש בפנים עוד <xliff:g id="NUMBER_1">%s</xliff:g> הודעות.</item>
       <item quantity="many">יש בפנים עוד <xliff:g id="NUMBER_1">%s</xliff:g> הודעות.</item>
@@ -405,9 +405,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"שקט\nמוחלט"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"הודעות בעדיפות\nבלבד"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"התראות\nבלבד"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • בטעינה (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> עד לסיום)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • בטעינה מהירה (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> עד לסיום)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • בטעינה איטית (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> עד לסיום)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • בטעינה (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> עד לסיום)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • בטעינה מהירה (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> עד לסיום)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • בטעינה איטית (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> עד לסיום)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"החלפת משתמש"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"החלף משתמש. המשתמש הנוכחי הוא <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"משתמש נוכחי <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -432,6 +432,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"נתק משתמש"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"האם להוסיף משתמש חדש?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"בעת הוספת משתמש חדש, על משתמש זה להגדיר את השטח שלו.\n\nכל משתמש יכול לעדכן אפליקציות עבור כל המשתמשים האחרים."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"האם להסיר את המשתמש?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"כל האפליקציות והנתונים של המשתמש הזה יימחקו."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"הסר"</string>
@@ -739,6 +742,8 @@
     <string name="left_icon" msgid="3096287125959387541">"סמל שמאלי"</string>
     <string name="right_icon" msgid="3952104823293824311">"סמל ימני"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"יש ללחוץ ולגרור כדי להוסיף אריחים"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"גרור לכאן כדי להסיר"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"יש צורך בשישה אריחים לכל הפחות"</string>
     <string name="qs_edit" msgid="2232596095725105230">"עריכה"</string>
@@ -767,12 +772,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"מסך תחתון מלא"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"מיקום <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. הקש פעמיים כדי לערוך."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. הקש פעמיים כדי להוסיף."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"מיקום <xliff:g id="POSITION">%1$d</xliff:g>. הקש פעמיים כדי לבחור."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"הזזת <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"הסרת <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> התווסף למיקום <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> הוסר"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> הועבר למיקום <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"הוספת <xliff:g id="TILE_NAME">%1$s</xliff:g> למיקום <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"העברת <xliff:g id="TILE_NAME">%1$s</xliff:g> למיקום <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"עורך הגדרות מהירות."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"הודעת <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"ייתכן שהיישום לא יפעל עם מסך מפוצל."</string>
@@ -833,7 +836,7 @@
     <string name="app_info" msgid="6856026610594615344">"פרטי אפליקציה"</string>
     <string name="go_to_web" msgid="2650669128861626071">"מעבר אל הדפדפן"</string>
     <string name="mobile_data" msgid="7094582042819250762">"נתונים סלולריים"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> ‏— <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> ‏— <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"‏Wi-Fi כבוי"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"‏Bluetooth כבוי"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"מצב \'נא לא להפריע\' כבוי"</string>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index 001be11..b34a5b4 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"通知"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"もうすぐ電池がなくなります"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"残量が<xliff:g id="PERCENTAGE">%s</xliff:g>です"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"残量 <xliff:g id="PERCENTAGE">%s</xliff:g>、約 <xliff:g id="TIME">%s</xliff:g>(使用状況に基づく)"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"残量 <xliff:g id="PERCENTAGE">%s</xliff:g>、約 <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"残量 <xliff:g id="PERCENTAGE">%1$s</xliff:g>、約 <xliff:g id="TIME">%2$s</xliff:g>(使用状況に基づく)"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"残量 <xliff:g id="PERCENTAGE">%1$s</xliff:g>、約 <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"残量が <xliff:g id="PERCENTAGE">%s</xliff:g> です。バッテリー セーバーは ON です。"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB 経由では充電できません。端末に付属の充電器を使用してください。"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB 経由では充電できません"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"現在地リクエストがアクティブ"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"通知をすべて消去。"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"他 <xliff:g id="NUMBER">%s</xliff:g> 件"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>、他 <xliff:g id="OVERFLOW">%s</xliff:g> 件"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>、他 <xliff:g id="OVERFLOW">%2$s</xliff:g> 件"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">他 <xliff:g id="NUMBER_1">%s</xliff:g> 件の通知</item>
       <item quantity="one">他 <xliff:g id="NUMBER_0">%s</xliff:g> 件の通知</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"サイレント\n"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"重要な\n通知のみ"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"アラーム\nのみ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 充電中(完了まで <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 急速充電中(完了まで <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 低速充電中(完了まで <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 充電中(完了まで <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 急速充電中(完了まで <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 低速充電中(完了まで <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ユーザーを切り替える"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ユーザーを切り替える、現在のユーザーは<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"現在のユーザー: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ユーザーをログアウト"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"新しいユーザーを追加しますか?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"ユーザーを削除しますか?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"このユーザーのアプリとデータがすべて削除されます。"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"削除"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"左アイコン"</string>
     <string name="right_icon" msgid="3952104823293824311">"右アイコン"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"タイルを追加するには押し続けながらドラッグ"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"削除するにはここにドラッグ"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"タイルは 6 個以上必要"</string>
     <string name="qs_edit" msgid="2232596095725105230">"編集"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"下部全画面"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ポジション <xliff:g id="POSITION">%1$d</xliff:g> の <xliff:g id="TILE_NAME">%2$s</xliff:g> を編集するにはダブルタップします。"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g> を追加するにはダブルタップします。"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ポジション <xliff:g id="POSITION">%1$d</xliff:g> に配置します。選択するにはダブルタップします。"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> を移動します"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> を削除します"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> をポジション <xliff:g id="POSITION">%2$d</xliff:g> に追加しました"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> を削除しました"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> をポジション <xliff:g id="POSITION">%2$d</xliff:g> に移動しました"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> をポジション <xliff:g id="POSITION">%2$d</xliff:g> に追加"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> をポジション <xliff:g id="POSITION">%2$d</xliff:g> に移動"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"クイック設定エディタ"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> の通知: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"アプリは分割画面では動作しないことがあります。"</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"アプリ情報"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ブラウザに移動"</string>
     <string name="mobile_data" msgid="7094582042819250762">"モバイルデータ"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi は OFF です"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth は OFF です"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"マナーモードは OFF です"</string>
diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml
index c28fab7..e490dac 100644
--- a/packages/SystemUI/res/values-ka/strings.xml
+++ b/packages/SystemUI/res/values-ka/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"შეტყობინებები"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ბატარეა შესაძლოა მალე ამოიწუროს"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"დარჩენილია <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"დარჩენილია <xliff:g id="PERCENTAGE">%s</xliff:g>, რაც დაახლოებით <xliff:g id="TIME">%s</xliff:g> არის, მოხმარების გათვალისწინებით"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"დარჩენილია <xliff:g id="PERCENTAGE">%s</xliff:g>, რაც დაახლოებით <xliff:g id="TIME">%s</xliff:g> არის"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"დარჩენილია <xliff:g id="PERCENTAGE">%1$s</xliff:g>, რაც დაახლოებით <xliff:g id="TIME">%2$s</xliff:g> არის, მოხმარების გათვალისწინებით"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"დარჩენილია <xliff:g id="PERCENTAGE">%1$s</xliff:g>, რაც დაახლოებით <xliff:g id="TIME">%2$s</xliff:g> არის"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"დარჩენილია <xliff:g id="PERCENTAGE">%s</xliff:g>. ბატარეის დამზოგი ჩართულია."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB-თ დატენვა ვერ ხერხდება. გამოიყენეთ დამტენი, რომელიც თქვენს მოწყობილობას მოჰყვა."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB-თ დატენვა ვერ ხერხდება"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"მდებარეობის მოთხოვნები აქტიურია"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"ყველა შეტყობინების წაშლა"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">კიდევ <xliff:g id="NUMBER_1">%s</xliff:g> შეტყობინება ჯგუფში.</item>
       <item quantity="one">კიდევ <xliff:g id="NUMBER_0">%s</xliff:g> შეტყობინება ჯგუფში.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"სრული\nსიჩუმე"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"მხოლოდ\nპრიორიტეტულები"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"მხოლოდ\nგაფრთხილებები"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • იტენება (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> სრულ დატენვამდე)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • იტენება სწრაფად (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> სრულ დატენვამდე)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • იტენება ნელა (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> სრულ დატენვამდე)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • იტენება (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> სრულ დატენვამდე)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • იტენება სწრაფად (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> სრულ დატენვამდე)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • იტენება ნელა (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> სრულ დატენვამდე)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"მომხმარებლის გადართვა"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"მომხმარებლის გდართვა. ამჟამინდელი მომხმარებელი <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"ამჟამინდელი მომხმარებელი <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"მომხმარებლის გასვლა"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"დაემატოს ახალი მომხმარებელი?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"ახალი მომხმარებლის დამატებისას, ამ მომხმარებელს საკუთარი სივრცის შექმნა მოუწევს.\n\nნებისმიერ მომხმარებელს შეუძლია აპები ყველა სხვა მომხმარებლისათვის განაახლოს."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"გსურთ მომხმარებლის წაშლა?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"ამ მომხმარებლის ყველა აპი და მონაცემი წაიშლება."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"წაშლა"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"მარცხენა ხატულა"</string>
     <string name="right_icon" msgid="3952104823293824311">"მარჯვენა ხატულა"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ჩავლებით გადაიტანეთ ბლოკების დასამატებლად"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ამოსაშლელად, ჩავლებით გადმოიტანეთ აქ"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"გჭირდებათ მინიმუმ 6 ბლოკი"</string>
     <string name="qs_edit" msgid="2232596095725105230">"რედაქტირება"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"ქვედა ნაწილის სრულ ეკრანზე გაშლა"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"პოზიცია <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. რედაქტირებისთვის, შეეხეთ ორმაგად."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. დასამატებლად, შეეხეთ ორმაგად."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"პოზიცია <xliff:g id="POSITION">%1$d</xliff:g>. ასარჩევად, შეეხეთ ორმაგად."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-ის გადატანა"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-ის წაშლა"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> დამატებულია პოზიციაზე <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ამოიშალა"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> გადატანილია პოზიციაზე <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-ის დამატება პოზიციაზე <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-ის გადატანა პოზიციაზე <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"სწრაფი პარამეტრების რედაქტორი."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> შეტყობინება: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"აპმა შეიძლება არ იმუშაოს გაყოფილი ეკრანის რეჟიმში."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"აპის შესახებ"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ბრაუზერზე გადასვლა"</string>
     <string name="mobile_data" msgid="7094582042819250762">"მობილური ინტერნეტი"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi გამორთულია"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth გამორთულია"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"„არ შემაწუხოთ“ რეჟიმი გამორთულია"</string>
diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml
index f256d33..eb50c28 100644
--- a/packages/SystemUI/res/values-kk/strings.xml
+++ b/packages/SystemUI/res/values-kk/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Хабарлар"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Батерея заряды жақын арада бітуі мүмкін"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> қалды"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Пайдалану барысына байланысты <xliff:g id="PERCENTAGE">%s</xliff:g> заряд, шамамен <xliff:g id="TIME">%s</xliff:g> қалды"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> заряд, шамамен <xliff:g id="TIME">%s</xliff:g> қалды"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Пайдалану барысына байланысты <xliff:g id="PERCENTAGE">%1$s</xliff:g> заряд, шамамен <xliff:g id="TIME">%2$s</xliff:g> қалды"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> заряд, шамамен <xliff:g id="TIME">%2$s</xliff:g> қалды"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> қалды. Battery Saver қосулы."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB арқылы зарядтау мүмкін емес. Құрылғымен бірге берілген зарядтау құралын пайдаланыңыз."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB арқылы зарядтау мүмкін емес"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Орын өтініштері қосылған"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Барлық хабарларды жойыңыз."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Ішінде тағы <xliff:g id="NUMBER_1">%s</xliff:g> хабарландыру.</item>
       <item quantity="one">Ішінде тағы <xliff:g id="NUMBER_0">%s</xliff:g> хабарландыру.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Толық\nтыныштық"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Тек\nбасымдық"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Тек\nдабылдар"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Зарядталуда (толуына <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> қалды)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Жылдам зарядталуда (толуына <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> қалды)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Баяу зарядталуда (толуына <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> қалды)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Зарядталуда (толуына <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> қалды)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Жылдам зарядталуда (толуына <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> қалды)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Баяу зарядталуда (толуына <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> қалды)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Пайдаланушыны ауыстыру"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Пайдаланушыны ауыстыру, ағымдағы пайдаланушы <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Ағымдағы пайдаланушы: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ПАЙДАЛАНУШЫНЫ ШЫҒАРУ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Жаңа пайдаланушы қосылсын ба?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Жаңа пайдаланушыны қосқанда, сол адам өз кеңістігін реттеуі керек.\n\nКез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Пайдаланушы жойылсын ба?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Осы пайдаланушының барлық қолданбалары мен деректері жойылады."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Жою"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Сол жақ белгіше"</string>
     <string name="right_icon" msgid="3952104823293824311">"Оң жақ белгіше"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Қажетті элементтерді сүйреп әкеліп қойыңыз"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Керексіздерін осы жерге сүйреңіз"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Кемінде 6 бөлшек қажет"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Өңдеу"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Төменгісін толық экранға шығару"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g> орны, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Өңдеу үшін екі рет түртіңіз."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Қосу үшін екі рет түртіңіз."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g> орны. Таңдау үшін екі рет түртіңіз."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> жылжыту"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> жою"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g> орнына қосылды"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> жойылды"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g> орнына жылжытылды"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> бөлшегін <xliff:g id="POSITION">%2$d</xliff:g>-позицияға енгізу"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> бөлшегін <xliff:g id="POSITION">%2$d</xliff:g>-позицияға жылжыту"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Жылдам параметрлер өңдегіші."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> хабарландыруы: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Қолданба бөлінген экранда жұмыс істемеуі мүмкін."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Қолданба ақпараты"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Браузерге өту"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Мобильдік деректер"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi өшірулі"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth өшірулі"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\"Мазаламау\" режимі өшірулі"</string>
diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml
index 2c9a554..4f1d71d 100644
--- a/packages/SystemUI/res/values-km/strings.xml
+++ b/packages/SystemUI/res/values-km/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"ការ​ជូន​ដំណឹង"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"អាចនឹងអស់ថ្មក្នុងពេលបន្តិចទៀត"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"នៅ​សល់ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"នៅសល់ <xliff:g id="PERCENTAGE">%s</xliff:g> អាច​ប្រើ​បាន​ប្រហែល <xliff:g id="TIME">%s</xliff:g> ទៀត​ផ្អែកលើ​ការប្រើប្រាស់​របស់អ្នក"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"នៅសល់ <xliff:g id="PERCENTAGE">%s</xliff:g> អាច​ប្រើ​បាន​ប្រហែល <xliff:g id="TIME">%s</xliff:g> ទៀត"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"នៅសល់ <xliff:g id="PERCENTAGE">%1$s</xliff:g> អាច​ប្រើ​បាន​ប្រហែល <xliff:g id="TIME">%2$s</xliff:g> ទៀត​ផ្អែកលើ​ការប្រើប្រាស់​របស់អ្នក"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"នៅសល់ <xliff:g id="PERCENTAGE">%1$s</xliff:g> អាច​ប្រើ​បាន​ប្រហែល <xliff:g id="TIME">%2$s</xliff:g> ទៀត"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"នៅ​សល់ <xliff:g id="PERCENTAGE">%s</xliff:g> ។ កម្មវិធី​សន្សំ​ថ្ម​បានបើក។"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"មិន​អាច​សាក​តាម USB បានទេ។ សូម​ប្រើ​ឆ្នាំង​សាក​ដែល​ភ្ជាប់​មក​ជាមួយ​ឧបករណ៍​របស់អ្នក។"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"មិន​អាច​សាក​តាម USB បានទេ"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"សំណើ​ទីតាំង​សកម្ម"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"សម្អាត​ការ​ជូន​ដំណឹង​ទាំងអស់។"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">មានការជូនដំណឹង <xliff:g id="NUMBER_1">%s</xliff:g> ទៀតនៅខាងក្នុង</item>
       <item quantity="one">មានការជូនដំណឹង <xliff:g id="NUMBER_0">%s</xliff:g> ទៀតនៅខាងក្នុង</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"ស្ងៀមស្ងាត់\nទាំងស្រុង"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"អាទិភាព\nប៉ុណ្ណោះ"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"សំឡេងរោទ៍\nប៉ុណ្ណោះ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • កំពុង​សាកថ្ម (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ទៀតទើប​ពេញ)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • កំពុង​សាកថ្មយ៉ាង​ឆាប់រហ័ស (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ទៀតទើបពេញ)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • កំពុង​សាកថ្ម​​យឺត (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ទៀតទើប​ពេញ)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • កំពុង​សាកថ្ម (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ទៀតទើប​ពេញ)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • កំពុង​សាកថ្មយ៉ាង​ឆាប់រហ័ស (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ទៀតទើបពេញ)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • កំពុង​សាកថ្ម​​យឺត (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ទៀតទើប​ពេញ)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ប្ដូរ​អ្នក​ប្រើ"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ប្ដូរ​អ្នកប្រើ ​អ្នកប្រើ​បច្ចុប្បន្ន <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"អ្នកប្រើបច្ចុប្បន្ន <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ចុះឈ្មោះអ្នកប្រើចេញ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"បន្ថែម​អ្នកប្រើ​ថ្មី?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"ពេល​អ្នក​បន្ថែម​អ្នកប្រើ​ថ្មី អ្នកប្រើ​នោះ​ត្រូវ​កំណត់​ទំហំ​ផ្ទាល់​របស់​គេ។\n\nអ្នក​ប្រើ​ណាមួយ​ក៏​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី​សម្រាប់​អ្នកប្រើ​ផ្សេង​បាន​ដែរ។"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"យកអ្នកប្រើចេញ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"កម្មវិធី និងទិន្នន័យទាំងអស់របស់អ្នកប្រើនេះនឹងត្រូវបានលុប។"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"យកចេញ"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"រូបតំណាង​ខាង​ឆ្វេង"</string>
     <string name="right_icon" msgid="3952104823293824311">"រូបតំណាង​ខាង​ស្ដាំ"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ចុច​ឱ្យ​ជាប់ រួចអូសដើម្បី​បញ្ចូល​ប្រអប់"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"អូសទីនេះដើម្បីយកចេញ"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"អ្នកត្រូវការប្រអប់​យ៉ាងតិច 6"</string>
     <string name="qs_edit" msgid="2232596095725105230">"កែសម្រួល"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"អេក្រង់ពេញខាងក្រោម"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ទីតាំង <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>, ប៉ះពីរដងដើម្បីកែ"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>, ប៉ះពីរដងដើម្បីបន្ថែម"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ទីតាំង <xliff:g id="POSITION">%1$d</xliff:g>, ប៉ះពីរដងដើម្បីជ្រើស"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"ផ្លាស់ទី <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"យក <xliff:g id="TILE_NAME">%1$s</xliff:g> ចេញ"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ត្រូវបានបន្ថែមទៅទីតាំង <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ត្រូវបានយកចេញ"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> បានផ្លាស់ទីទៅទីតាំង <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"បញ្ចូល <xliff:g id="TILE_NAME">%1$s</xliff:g> ទៅទីតាំង <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"ផ្លាស់ទី <xliff:g id="TILE_NAME">%1$s</xliff:g> ទៅទីតាំង <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"កម្មវិធីកែការកំណត់រហ័ស"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> ការជូនដំណឹង៖ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"កម្មវិធីអាចនឹងមិនដំណើរការនៅលើអេក្រង់បំបែកទេ"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ព័ត៌មាន​កម្មវិធី"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ចូល​ទៅ​កម្មវិធី​រុករក​តាម​អ៊ីនធឺណិត"</string>
     <string name="mobile_data" msgid="7094582042819250762">"ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi បាន​បិទ"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ប៊្លូធូស​បាន​បិទ"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"មុខងារ​កុំរំខាន​បាន​បិទ"</string>
diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml
index 8760d00..49a9419b 100644
--- a/packages/SystemUI/res/values-kn/strings.xml
+++ b/packages/SystemUI/res/values-kn/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ಬ್ಯಾಟರಿ ಸದ್ಯದಲ್ಲೇ ಖಾಲಿಯಾಗಬಹುದು"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> ಉಳಿದಿದೆ"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> ಬಾಕಿ ಉಳಿದಿದೆ, ನಿಮ್ಮ ಬಳಕೆಯ ಆಧಾರದ ಮೇಲೆ <xliff:g id="TIME">%s</xliff:g> ಉಳಿದಿದೆ"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> ಬಾಕಿ ಉಳಿದಿದೆ, <xliff:g id="TIME">%s</xliff:g> ಉಳಿದಿದೆ"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ಬಾಕಿ ಉಳಿದಿದೆ, ನಿಮ್ಮ ಬಳಕೆಯ ಆಧಾರದ ಮೇಲೆ <xliff:g id="TIME">%2$s</xliff:g> ಉಳಿದಿದೆ"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ಬಾಕಿ ಉಳಿದಿದೆ, <xliff:g id="TIME">%2$s</xliff:g> ಉಳಿದಿದೆ"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> ಉಳಿದಿದೆ. ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಆನ್‌ ಆಗಿದೆ."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB ಮೂಲಕ ಚಾರ್ಜ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ನೀಡಲಾಗಿರುವ ಚಾರ್ಜರ್‌ ಬಳಸಿ."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB ಮೂಲಕ ಚಾರ್ಜ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"ಸ್ಥಳ ವಿನಂತಿಗಳು ಸಕ್ರಿಯವಾಗಿವೆ"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೆರವುಗೊಳಿಸು."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> ಕ್ಕಿಂತ ಹೆಚ್ಚು ಅಧಿಸೂಚನೆಗಳು ಒಳಗಿವೆ.</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> ಕ್ಕಿಂತ ಹೆಚ್ಚು ಅಧಿಸೂಚನೆಗಳು ಒಳಗಿವೆ.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"ಸಂಪೂರ್ಣ\nನಿಶ್ಯಬ್ಧ"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"ಆದ್ಯತೆ\nಮಾತ್ರ"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"ಅಲಾರಮ್‌ಗಳು\nಮಾತ್ರ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ಚಾರ್ಜ್‌ಆಗುತ್ತಿದೆ (ಪೂರ್ಣಗೊಳ್ಳಲು <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ಸಮಯ ಬಾಕಿ)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ವೇಗವಾಗಿ ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ (ಪೂರ್ಣಗೊಳ್ಳಲು <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ಸಮಯ ಬಾಕಿ)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ನಿಧಾನವಾಗಿ ಚಾರ್ಜ್‌ಆಗುತ್ತಿದೆ (ಪೂರ್ಣವಾಗಲು <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ಸಮಯ ಬಾಕಿ)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ಚಾರ್ಜ್‌ಆಗುತ್ತಿದೆ (ಪೂರ್ಣಗೊಳ್ಳಲು <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ಸಮಯ ಬಾಕಿ)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ವೇಗವಾಗಿ ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ (ಪೂರ್ಣಗೊಳ್ಳಲು <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ಸಮಯ ಬಾಕಿ)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ನಿಧಾನವಾಗಿ ಚಾರ್ಜ್‌ಆಗುತ್ತಿದೆ (ಪೂರ್ಣವಾಗಲು <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ಸಮಯ ಬಾಕಿ)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ಬಳಕೆದಾರರನ್ನು ಬದಲಿಸಿ"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ಬಳಕೆದಾರರನ್ನು ಬದಲಿಸಿ, ಪ್ರಸ್ತುತ ಬಳಕೆದಾರ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"<xliff:g id="CURRENT_USER_NAME">%s</xliff:g> ಪ್ರಸ್ತುತ ಬಳಕೆದಾರ"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ಬಳಕೆದಾರರನ್ನು ಲಾಗ್ಔಟ್ ಮಾಡಿ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸುವುದೇ?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"ನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ.\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಬಹುದು."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"ಬಳಕೆದಾರರನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"ಈ ಬಳಕೆದಾರರ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"ತೆಗೆದುಹಾಕಿ"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"ಎಡ ಐಕಾನ್"</string>
     <string name="right_icon" msgid="3952104823293824311">"ಬಲ ಐಕಾನ್"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ಟೈಲ್‌ಗಳನ್ನು ಸೇರಿಸಲು ಹೋಲ್ಡ್‌ ಮಾಡಿ ಮತ್ತು ಡ್ರ್ಯಾಗ್‌ ಮಾಡಿ"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ತೆಗೆದುಹಾಕಲು ಇಲ್ಲಿ ಡ್ರ್ಯಾಗ್‌ ಮಾಡಿ"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"ನಿಮಗೆ ಕನಿಷ್ಠ 6 ಟೈಲ್‌ಗಳ ಅಗತ್ಯವಿದೆ"</string>
     <string name="qs_edit" msgid="2232596095725105230">"ಎಡಿಟ್"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"ಕೆಳಗಿನ ಪೂರ್ಣ ಪರದೆ"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ಸ್ಥಳ <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. ಎಡಿಟ್ ಮಾಡಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. ಸೇರಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ಸ್ಥಳ <xliff:g id="POSITION">%1$d</xliff:g>. ಆಯ್ಕೆಮಾಡಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ಸರಿಸಿ"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="POSITION">%2$d</xliff:g> ಸ್ಥಾನಕ್ಕೆ <xliff:g id="TILE_NAME">%1$s</xliff:g> ಸೇರಿಸಲಾಗಿದೆ"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="POSITION">%2$d</xliff:g> ಸ್ಥಾನಕ್ಕೆ <xliff:g id="TILE_NAME">%1$s</xliff:g> ಸೇರಿಸಲಾಗಿದೆ"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ಅನ್ನು <xliff:g id="POSITION">%2$d</xliff:g> ಗೆ ಸೇರಿಸಿ"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ಅನ್ನು <xliff:g id="POSITION">%2$d</xliff:g> ಗೆ ಸರಿಸಿ"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‍ಗಳ ಎಡಿಟರ್."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> ಅಧಿಸೂಚನೆ: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"ವಿಭಜಿಸಿದ ಪರದೆಯಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್ ಕೆಲಸ ಮಾಡದೇ ಇರಬಹುದು."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ಬ್ರೌಸರ್‌ಗೆ ಹೋಗಿ"</string>
     <string name="mobile_data" msgid="7094582042819250762">"ಮೊಬೈಲ್ ಡೇಟಾ"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"ವೈ-ಫೈ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ಬ್ಲೂಟೂತ್‌ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆಫ್ ಆಗಿದೆ"</string>
diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml
index 7983966..ad98bce 100644
--- a/packages/SystemUI/res/values-ko/strings.xml
+++ b/packages/SystemUI/res/values-ko/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"알림"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"배터리가 얼마 남지 않음"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> 남았습니다."</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> 남음, 내 사용량을 기준으로 약 <xliff:g id="TIME">%s</xliff:g> 남음"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> 남음, 약 <xliff:g id="TIME">%s</xliff:g> 남음"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> 남음, 내 사용량을 기준으로 약 <xliff:g id="TIME">%2$s</xliff:g> 남음"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> 남음, 약 <xliff:g id="TIME">%2$s</xliff:g> 남음"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> 남았습니다. 배터리 세이버를 사용 중입니다."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB로 충전할 수 없습니다. 기기와 함께 제공된 충전기를 사용하세요."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB로 충전할 수 없습니다."</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"위치 요청 있음"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"모든 알림 지우기"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g>개 더보기"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g>개 알림 더보기</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g>개 알림 더보기</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"모두\n차단"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"중요 알림만\n허용"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"알람만\n"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 충전 중(<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> 후 충전 완료)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 고속 충전 중(<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> 후 충전 완료)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 저속 충전 중(<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> 후 충전 완료)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 충전 중(<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> 후 충전 완료)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 고속 충전 중(<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> 후 충전 완료)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 저속 충전 중(<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> 후 충전 완료)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"사용자 전환"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"사용자 전환, 현재 사용자 <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"현재 사용자: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"사용자 로그아웃"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"새 사용자를 추가할까요?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"추가된 새로운 사용자는 자신의 공간을 설정해야 합니다.\n\n모든 사용자는 다른 사용자들을 위하여 앱을 업데이트할 수 있습니다."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"사용자를 삭제할까요?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"이 사용자의 모든 앱과 데이터가 삭제됩니다."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"삭제"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"왼쪽 아이콘"</string>
     <string name="right_icon" msgid="3952104823293824311">"오른쪽 아이콘"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"길게 터치하고 드래그하여 타일 추가"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"여기로 드래그하여 삭제"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"6개 이상의 타일이 필요합니다."</string>
     <string name="qs_edit" msgid="2232596095725105230">"수정"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"아래쪽 화면 전체화면"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"위치 <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. 수정하려면 두 번 탭하세요."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. 추가하려면 두 번 탭하세요."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"위치 <xliff:g id="POSITION">%1$d</xliff:g>. 선택하려면 두 번 탭하세요."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 이동"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 삭제"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 타일이 위치 <xliff:g id="POSITION">%2$d</xliff:g>에 추가됩니다."</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 타일이 삭제되었습니다."</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 타일을 위치 <xliff:g id="POSITION">%2$d</xliff:g>(으)로 이동함"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 타일을 위치 <xliff:g id="POSITION">%2$d</xliff:g>에 추가"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 타일을 위치 <xliff:g id="POSITION">%2$d</xliff:g>(으)로 이동"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"빠른 설정 편집기"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> 알림: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"앱이 분할 화면에서 작동하지 않을 수 있습니다."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"앱 정보"</string>
     <string name="go_to_web" msgid="2650669128861626071">"브라우저로 이동"</string>
     <string name="mobile_data" msgid="7094582042819250762">"모바일 데이터"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g>, <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi가 사용 중지됨"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"블루투스가 사용 중지됨"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"알림 일시중지가 사용 중지됨"</string>
diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml
index d9c9322..0bbdc91 100644
--- a/packages/SystemUI/res/values-ky/strings.xml
+++ b/packages/SystemUI/res/values-ky/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Билдирмелер"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Батарея жакында отуруп калышы мүмкүн"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> калды"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> калды, колдонушуңузга караганда болжол менен дагы <xliff:g id="TIME">%s</xliff:g> бар"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> калды, болжол менен дагы <xliff:g id="TIME">%s</xliff:g> бар"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> калды, колдонушуңузга караганда болжол менен дагы <xliff:g id="TIME">%2$s</xliff:g> бар"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> калды, болжол менен дагы <xliff:g id="TIME">%2$s</xliff:g> бар"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> калды. Батареяны үнөмдөгүч режими күйүк."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB аркылуу кубатталбай жатат. Түзмөгүңүз менен келген кубаттагычты колдонуңуз."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB аркылуу кубатталбай жатат"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Жайгаштыруу талаптары иштелүүдө"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Бардык эскертмелерди тазалоо."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Дагы <xliff:g id="NUMBER_1">%s</xliff:g> эскертме бар.</item>
       <item quantity="one">Дагы <xliff:g id="NUMBER_0">%s</xliff:g> эскертме бар.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Тым-\nтырс"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Артыкчылыктуу\nгана"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Ойготкучтар\nгана"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Кубатталууда (толгонго чейин <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> калды)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Тез кубатталууда (толгонго чейин <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> калды)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Жай кубатталууда (толгонго чейин <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> калды)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Кубатталууда (толгонго чейин <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> калды)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Тез кубатталууда (толгонго чейин <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> калды)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Жай кубатталууда (толгонго чейин <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> калды)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Колдонуучуну которуу"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Колдонуучуну күйгүзүү, учурдагы колдонуучу <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Учурдагы колдонуучу <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"КОЛДОНУУЧУНУ ТУТУМДАН ЧЫГАРУУ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Жаңы колдонуучу кошосузбу?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Жаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу жаңыртканда, ал калган бардык колдонуучулар үчүн да жаңырат."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Колдонуучу алынып салынсынбы?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Бул колдонуучунун бардык колдонмолору жана дайындары жок кылынат."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Алып салуу"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Сол жактагы сүрөтчө"</string>
     <string name="right_icon" msgid="3952104823293824311">"Оң жактагы сүрөтчө"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Керектүү элементтерди сүйрөп келиңиз"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Алып салуу үчүн бул жерге сүйрөңүз"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Сизге жок дегенде 6 мозаика керек"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Түзөтүү"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Ылдыйкы экранды толук экран режимине өткөрүү"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Орду - <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Түзөтүү үчүн эки жолу таптаңыз."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Кошуу үчүн эки жолу таптаңыз."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Орду - <xliff:g id="POSITION">%1$d</xliff:g>. Тандоо үчүн эки жолу таптаңыз."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> дегенди жылдыруу"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> дегенди алып салуу"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> деген <xliff:g id="POSITION">%2$d</xliff:g>-орунга кошулду"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> алынып салынды"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> деген <xliff:g id="POSITION">%2$d</xliff:g>-орунга жылдырылды"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> плиткасы <xliff:g id="POSITION">%2$d</xliff:g>-позицияга кошулсун"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> плиткасы <xliff:g id="POSITION">%2$d</xliff:g>-позицияга кошулсун"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Ыкчам жөндөөлөр түзөткүчү."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> эскертмеси: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Колдонмодо экран бөлүнбөшү мүмкүн."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Колдонмо тууралуу"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Серепчиге өтүү"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Мобилдик Интернет"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi өчүк"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth өчүк"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\"Тынчымды алба\" режими өчүк"</string>
diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml
index 7e2375e..12c67db 100644
--- a/packages/SystemUI/res/values-lo/strings.xml
+++ b/packages/SystemUI/res/values-lo/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"ການແຈ້ງເຕືອນ"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ແບັດເຕີຣີໃກ້ຈະໝົດແລ້ວ"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"ຍັງ​ເຫຼືອ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"ຍັງເຫຼືອ <xliff:g id="PERCENTAGE">%s</xliff:g>, ປະມານ <xliff:g id="TIME">%s</xliff:g> ໂດຍອ້າງອີງຈາກການນຳໃຊ້ຂອງທ່ານ"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"ຍັງເຫຼືອ <xliff:g id="PERCENTAGE">%s</xliff:g>, ປະມານ <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"ຍັງເຫຼືອ <xliff:g id="PERCENTAGE">%1$s</xliff:g>, ປະມານ <xliff:g id="TIME">%2$s</xliff:g> ໂດຍອ້າງອີງຈາກການນຳໃຊ້ຂອງທ່ານ"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"ຍັງເຫຼືອ <xliff:g id="PERCENTAGE">%1$s</xliff:g>, ປະມານ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"ຍັງເຫຼືອ <xliff:g id="PERCENTAGE">%s</xliff:g>. ເປີດໃຊ້ຕົວປະຢັດແບັດເຕີຣີແລ້ວ."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"ບໍ່ສາມາດສາກຜ່ານ USB ໄດ້. ໃຫ້ໃຊ້ຕົວສາກທີ່ມາພ້ອມກັບອຸປະກອນຂອງທ່ານ."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"ບໍ່ສາມາດສາກຜ່ານ USB ໄດ້"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"ການຮ້ອງຂໍສະຖານທີ່ທີ່ເຮັດວຽກຢູ່"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"ລຶບການແຈ້ງເຕືອນທັງໝົດ."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">ມີ <xliff:g id="NUMBER_1">%s</xliff:g> ການແຈ້ງເຕືອນເພີ່ມເຕີມຢູ່ທາງໃນ.</item>
       <item quantity="one">ມີ <xliff:g id="NUMBER_0">%s</xliff:g> ການແຈ້ງເຕືອນເພີ່ມເຕີມຢູ່ທາງໃນ.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"ຄວາມ​ງຽບ\nທັງ​ໝົດ"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"ບຸ​ລິ​ມະ​ສິດ\nເທົ່າ​ນັ້ນ"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"ໂມງ​ປຸກ\nເທົ່າ​ນັ້ນ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ກຳລັງສາກ (ອີກ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ຈຶ່ງຈະເຕັມ)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ກຳລັງສາກແບບດ່ວນ (ອີກ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ຈຶ່ງຈະເຕັມ)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ກຳລັງສາກແບບຊ້າ (ອີກ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ຈຶ່ງຈະເຕັມ)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ກຳລັງສາກ (ອີກ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ຈຶ່ງຈະເຕັມ)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ກຳລັງສາກແບບດ່ວນ (ອີກ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ຈຶ່ງຈະເຕັມ)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ກຳລັງສາກແບບຊ້າ (ອີກ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ຈຶ່ງຈະເຕັມ)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ສະຫຼັບຜູ້ໃຊ້"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ປ່ຽນຜູ່ໃຊ້, ຜູ່ໃຊ້ປະຈຸບັນ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"ຜູ້ໃຊ້ປະຈຸບັນ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ເອົາຜູ້ໃຊ້ອອກຈາກລະບົບ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"ເພີ່ມຜູ້ໃຊ້ໃໝ່ບໍ?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"ເມື່ອ​ທ່ານ​ເພີ່ມ​ຜູ້ໃຊ້​ໃໝ່, ຜູ້ໃຊ້​ນັ້ນ​ຈະ​ຕ້ອງ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ລາວ.\n\nຜູ້ໃຊ້​ທຸກ​ຄົນ​ສາ​ມາດ​ອັບ​ເດດ​ແອັບຯຂອງ​ຜູ້​ໃຊ້​ຄົນ​ອື່ນ​ທັງ​ໝົດ​ໄດ້."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"ລຶບຜູ້ໃຊ້ອອກບໍ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"ທຸກ​ແອັບ ແລະ ຂໍ້​ມູນ​ຂອງ​ຜູ້​ໃຊ້​ນີ້​ຈະ​ຖືກ​ລຶບ."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"ເອົາ​ອອກ"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"ໄອຄອນຊ້າຍ"</string>
     <string name="right_icon" msgid="3952104823293824311">"ໄອຄອນຂວາ"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ກົດຄ້າງໄວ້ແລ້ວລາກເພື່ອເພີ່ມຊ່ອງ"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ລາກມາບ່ອນນີ້ເພື່ອລຶບອອກ"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"ທ່ານຍຕ້ອງໃຊ້ຢ່າງໜ້ອຍ 6 ຊ່ອງ"</string>
     <string name="qs_edit" msgid="2232596095725105230">"ແກ້ໄຂ"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"ເຕັມໜ້າຈໍລຸ່ມສຸດ"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ຕຳແໜ່ງ <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. ແຕະສອງເທື່ອເພື່ອແກ້ໄຂ."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. ແຕະສອງເທື່ອເພື່ອເພີ່ມ."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ຕຳແໜ່ງ <xliff:g id="POSITION">%1$d</xliff:g>. ແຕະສອງເທື່ອເພື່ອເລືອກ."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"ຍ້າຍ <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"ລຶບ <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ຖືກເພີ່ມໃສ່ຕຳແໜ່ງ <xliff:g id="POSITION">%2$d</xliff:g> ແລ້ວ"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"ລຶບ <xliff:g id="TILE_NAME">%1$s</xliff:g> ອອກແລ້ວ"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ຍ້າຍໄປຕຳແໜ່ງ <xliff:g id="POSITION">%2$d</xliff:g> ແລ້ວ"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"ເພີ່ມ <xliff:g id="TILE_NAME">%1$s</xliff:g> ໄປຕຳແໜ່ງ <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"ຍ້າຍ <xliff:g id="TILE_NAME">%1$s</xliff:g> ໄປຕຳແໜ່ງ <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ຕົວແກ້ໄຂການຕັ້ງຄ່າດ່ວນ"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"ການແຈ້ງເຕືອນ <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"ແອັບອາດໃຊ້ບໍ່ໄດ້ກັບການແບ່ງໜ້າຈໍ."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ຂໍ້ມູນແອັບ"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ໄປທີ່ໂປຣແກຣມທ່ອງເວັບ"</string>
     <string name="mobile_data" msgid="7094582042819250762">"ອິນເຕີເນັດມືຖື"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ປິດຢູ່"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth ປິດຢູ່"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"ຫ້າມລົບກວນ ປິດຢູ່"</string>
diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml
index 2c97127..f59b1ad 100644
--- a/packages/SystemUI/res/values-lt/strings.xml
+++ b/packages/SystemUI/res/values-lt/strings.xml
@@ -36,8 +36,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Pranešimai"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Akumuliatoriaus energija gali netrukus išsekti"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Liko <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Liko: <xliff:g id="PERCENTAGE">%s</xliff:g> (atsižvelgiant į naudojimą liko maždaug <xliff:g id="TIME">%s</xliff:g>)"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Liko: <xliff:g id="PERCENTAGE">%s</xliff:g> (liko maždaug <xliff:g id="TIME">%s</xliff:g>)"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Liko: <xliff:g id="PERCENTAGE">%1$s</xliff:g> (atsižvelgiant į naudojimą liko maždaug <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Liko: <xliff:g id="PERCENTAGE">%1$s</xliff:g> (liko maždaug <xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Liko <xliff:g id="PERCENTAGE">%s</xliff:g>. Akumuliatoriaus tausojimo priemonė įjungta."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Negalima įkrauti naudojant USB. Naudokite originalų su įrenginiu pateiktą įkroviklį."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Negalima įkrauti naudojant USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Vietovės užklausos aktyvios"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Išvalyti visus pranešimus."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"Dar <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Grupėje yra dar <xliff:g id="NUMBER_1">%s</xliff:g> pranešimas.</item>
       <item quantity="few">Grupėje yra dar <xliff:g id="NUMBER_1">%s</xliff:g> pranešimai.</item>
@@ -405,9 +405,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Visiška\ntyla"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Tik\nprioritetiniai"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Tik\nsignalai"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Įkraunama (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> iki visiško įkrovimo)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Greitai įkraunama (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> iki visiško įkr.)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lėtai įkraunama (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> iki visiško įkr.)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Įkraunama (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> iki visiško įkrovimo)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Greitai įkraunama (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> iki visiško įkr.)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lėtai įkraunama (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> iki visiško įkr.)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Perjungti naudotoją"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Perjungti naudotoją, dabartinis naudotojas <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Dabartinis naudotojas <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -432,6 +432,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ATJUNGTI NAUDOTOJĄ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Pridėti naują naudotoją?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Kai pridedate naują naudotoją, šis asmuo turi nustatyti savo erdvę.\n\nBet kuris naudotojas gali atnaujinti visų kitų naudotojų programas."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Pašalinti naudotoją?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Bus ištrinti visi šio naudotojo duomenys ir programos."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Pašalinti"</string>
@@ -739,6 +742,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Piktograma kairėje"</string>
     <string name="right_icon" msgid="3952104823293824311">"Piktograma dešinėje"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Jei norite pridėti išklotinių, laikykite nuspaudę ir vilkite"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Vilkite čia, jei norite pašalinti"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Turi būti bent 6 išklotinės"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Redaguoti"</string>
@@ -767,12 +772,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Apatinis ekranas viso ekrano režimu"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g> padėtis, išklotinės elementas „<xliff:g id="TILE_NAME">%2$s</xliff:g>“. Dukart palieskite, kad redaguotumėte."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"Išklotinės elementas „<xliff:g id="TILE_NAME">%1$s</xliff:g>“. Dukart palieskite, kad pridėtumėte."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g> padėtis. Dukart palieskite, kad pasirinktumėte."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Perkelti išklotinės elementą „<xliff:g id="TILE_NAME">%1$s</xliff:g>“"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Pašalinti išklotinės elementą „<xliff:g id="TILE_NAME">%1$s</xliff:g>“"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Išklotinės elementas „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ pridėtas prie <xliff:g id="POSITION">%2$d</xliff:g> padėties"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Išklotinės elementas „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ pašalintas"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Išklotinės elementas „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ perkeltas į <xliff:g id="POSITION">%2$d</xliff:g> padėtį"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Pridėti išklotinės elementą „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ į <xliff:g id="POSITION">%2$d</xliff:g> padėtį"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Perkelti išklotinės elementą „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ į <xliff:g id="POSITION">%2$d</xliff:g> padėtį"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Sparčiųjų nustatymų redagavimo priemonė."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"„<xliff:g id="ID_1">%1$s</xliff:g>“ pranešimas: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Programa gali neveikti naudojant skaidytą ekraną."</string>
@@ -833,7 +836,7 @@
     <string name="app_info" msgid="6856026610594615344">"Programos informacija"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Eiti į naršyklę"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobilieji duomenys"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g>–<xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g>–<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"„Wi-Fi“ išjungtas"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"„Bluetooth“ išjungtas"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Netrukdymo režimas išjungtas"</string>
diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml
index 86e2e4c..0075094 100644
--- a/packages/SystemUI/res/values-lv/strings.xml
+++ b/packages/SystemUI/res/values-lv/strings.xml
@@ -35,8 +35,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Paziņojumi"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Akumulators, iespējams, drīz izlādēsies"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Atlikuši <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Atlikušais laiks: <xliff:g id="PERCENTAGE">%s</xliff:g> — aptuveni <xliff:g id="TIME">%s</xliff:g> (ņemot vērā lietojumu)"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Atlikušais laiks: <xliff:g id="PERCENTAGE">%s</xliff:g> — aptuveni <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Atlikušais laiks: <xliff:g id="PERCENTAGE">%1$s</xliff:g> — aptuveni <xliff:g id="TIME">%2$s</xliff:g> (ņemot vērā lietojumu)"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Atlikušais laiks: <xliff:g id="PERCENTAGE">%1$s</xliff:g> — aptuveni <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Atlikuši <xliff:g id="PERCENTAGE">%s</xliff:g>. Ir ieslēgts akumulatora jaudas taupīšanas režīms."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Nevar veikt uzlādi, izmantojot USB. Izmantojiet ierīces komplektācijā iekļauto uzlādes ierīci."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Nevar veikt uzlādi, izmantojot USB"</string>
@@ -258,7 +258,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Aktīvi atrašanās vietu pieprasījumi"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Notīrīt visus paziņojumus"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"vēl <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> + <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> + <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="zero">Vēl <xliff:g id="NUMBER_1">%s</xliff:g> paziņojumi grupā.</item>
       <item quantity="one">Vēl <xliff:g id="NUMBER_1">%s</xliff:g> paziņojums grupā.</item>
@@ -402,9 +402,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Pilnīgs\nklusums"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Tikai\nprioritārie"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Tikai\nsignāli"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Notiek uzlāde (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> līdz pilnai uzlādei)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ātrā uzlāde (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> līdz pilnai uzlādei)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lēnā uzlāde (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> līdz pilnai uzlādei)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Notiek uzlāde (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> līdz pilnai uzlādei)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ātrā uzlāde (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> līdz pilnai uzlādei)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lēnā uzlāde (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> līdz pilnai uzlādei)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Mainīt lietotāju"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Pārslēgt lietotāju; pašreizējais lietotājs: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Pašreizējais lietotājs: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -429,6 +429,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ATTEIKT LIETOTĀJU"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Vai pievienot jaunu lietotāju?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Kad pievienosiet jaunu lietotāju, viņam būs jāizveido savs profils.\n\nIkviens lietotājs var atjaunināt lietotnes citu lietotāju vietā."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Vai noņemt lietotāju?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Tiks dzēstas visas šī lietotāja lietotnes un dati."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Noņemt"</string>
@@ -734,6 +737,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ikona kreisajā pusē"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ikona labajā pusē"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Lai pievienotu elementus, pieturiet tos un velciet"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Lai noņemtu vienumus, velciet tos šeit."</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Nepieciešami vismaz 6 elementi"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Rediģēt"</string>
@@ -762,12 +767,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Apakšdaļu pa visu ekrānu"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g>. pozīcija, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Lai rediģētu, veiciet dubultskārienu."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Lai pievienotu, veiciet dubultskārienu."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g>. pozīcija. Lai atlasītu, veiciet dubultskārienu."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Pārvietot elementu <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Noņemt elementu <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Elements <xliff:g id="TILE_NAME">%1$s</xliff:g> ir pievienots <xliff:g id="POSITION">%2$d</xliff:g>. pozīcijā"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Elements <xliff:g id="TILE_NAME">%1$s</xliff:g> ir noņemts"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Elements <xliff:g id="TILE_NAME">%1$s</xliff:g> ir pārvietots uz <xliff:g id="POSITION">%2$d</xliff:g>. pozīciju"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Pievienot elementu “<xliff:g id="TILE_NAME">%1$s</xliff:g>” <xliff:g id="POSITION">%2$d</xliff:g>. pozīcijā"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Pārvietot elementu “<xliff:g id="TILE_NAME">%1$s</xliff:g>” uz <xliff:g id="POSITION">%2$d</xliff:g>. pozīciju"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Ātro iestatījumu redaktors."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> paziņojums: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Iespējams, lietotnē nedarbosies ekrāna sadalīšana."</string>
@@ -828,7 +831,7 @@
     <string name="app_info" msgid="6856026610594615344">"Lietotnes informācija"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Atvērt pārlūku"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobilie dati"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ir izslēgts"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth ir izslēgts"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Režīms “Netraucēt” ir izslēgts"</string>
diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml
index 88ea162..68dc653 100644
--- a/packages/SystemUI/res/values-mk/strings.xml
+++ b/packages/SystemUI/res/values-mk/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Известувања"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Наскоро може да снема батерија"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Преостануваат <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Преостануваат <xliff:g id="PERCENTAGE">%s</xliff:g>, уште околу <xliff:g id="TIME">%s</xliff:g> според користењето"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Преостануваат <xliff:g id="PERCENTAGE">%s</xliff:g>, уште околу <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Преостануваат <xliff:g id="PERCENTAGE">%1$s</xliff:g>, уште околу <xliff:g id="TIME">%2$s</xliff:g> според користењето"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Преостануваат <xliff:g id="PERCENTAGE">%1$s</xliff:g>, уште околу <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Преостануваат <xliff:g id="PERCENTAGE">%s</xliff:g>. Штедачот на батерија е вклучен."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Не може да се полни преку USB. Користете го полначот што дојде со вашиот уред."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Не може да се полни преку USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Активни барања за локација"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Исчисти ги сите известувања."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, + <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, + <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Уште <xliff:g id="NUMBER_1">%s</xliff:g> известување внатре.</item>
       <item quantity="other">Уште <xliff:g id="NUMBER_1">%s</xliff:g> известувања внатре.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Целосна\nтишина"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Само\nприоритетни"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Само\nаларми"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Се полни (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до полна батерија)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Брзо полнење (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до полна батерија)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Бавно полнење (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до полна батерија)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Се полни (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> до полна батерија)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Брзо полнење (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> до полна батерија)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Бавно полнење (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> до полна батерија)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Промени го корисникот"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Промени го корисникот, тековен корисник <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Тековен корисник <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ОДЈАВИ ГО КОРИСНИКОТ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Да се додаде нов корисник?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Кога додавате нов корисник, тоа лице треба да го постави својот простор.\n\nСекој корисник може да ажурира апликации за сите други корисници."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Да се отстрани корисникот?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Сите апликации и податоци од овој корисник ќе се избришат."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Отстрани"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Лева икона"</string>
     <string name="right_icon" msgid="3952104823293824311">"Десна икона"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Задржете и влечете за да додадете плочки"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Повлечете тука за да се отстрани"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Потребни ви се најмалку 6 плочки"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Измени"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Долниот на цел екран"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Место <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Допрете двапати за уредување."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Допрете двапати за додавање."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Место <xliff:g id="POSITION">%1$d</xliff:g>. Допрете двапати за избирање."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Преместете <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Отстранете <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> е додадена на место <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> е отстранета"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> е преместена на место <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Додајте <xliff:g id="TILE_NAME">%1$s</xliff:g> на позицијата <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Преместете <xliff:g id="TILE_NAME">%1$s</xliff:g> на позицијата <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Уредник за брзи поставки."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Известување од <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Апликацијата можеби нема да работи во поделен екран."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Информации за апликација"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Одете на прелистувач"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Мобилен интернет"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi е исклучено"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth е исклучен"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"„Не вознемирувај“ е исклучено"</string>
diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml
index 9c18a22..507cbbf 100644
--- a/packages/SystemUI/res/values-ml/strings.xml
+++ b/packages/SystemUI/res/values-ml/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"അറിയിപ്പുകൾ"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ബാറ്ററി ഉടൻ തീർന്നേക്കാം"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> ശേഷിക്കുന്നു"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> അവശേഷിക്കുന്നു, ഉപയോഗം അടിസ്ഥാനമാക്കി ഏകദേശം <xliff:g id="TIME">%s</xliff:g> ശേഷിക്കുന്നു"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> അവശേഷിക്കുന്നു, ഏകദേശം <xliff:g id="TIME">%s</xliff:g> ശേഷിക്കുന്നു"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> അവശേഷിക്കുന്നു, ഉപയോഗം അടിസ്ഥാനമാക്കി ഏകദേശം <xliff:g id="TIME">%2$s</xliff:g> ശേഷിക്കുന്നു"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> അവശേഷിക്കുന്നു, ഏകദേശം <xliff:g id="TIME">%2$s</xliff:g> ശേഷിക്കുന്നു"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> ശേഷിക്കുന്നു. ബാറ്ററി ലാഭിക്കൽ ഓണാണ്."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB വഴി ചാർജ് ചെയ്യാനാകില്ല. നിങ്ങളുടെ ഉകരണത്തിനൊപ്പം ലഭിച്ച ചാർജർ ഉപയോഗിക്കുക."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB വഴി ചാർജ് ചെയ്യാനാകില്ല"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"ലൊക്കേഷൻ അഭ്യർത്ഥനകൾ സജീവമാണ്"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"എല്ലാ വിവരങ്ങളും മായ്‌ക്കുക."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">ഉള്ളിൽ <xliff:g id="NUMBER_1">%s</xliff:g> അറിയിപ്പുകൾ കൂടിയുണ്ട്.</item>
       <item quantity="one">ഉള്ളിൽ <xliff:g id="NUMBER_0">%s</xliff:g> അറിയിപ്പ് കൂടിയുണ്ട്.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"പൂർണ്ണ\nനിശബ്‌ദത"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"മുൻഗണന\nമാത്രം"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"അലാറങ്ങൾ\nമാത്രം"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ചാർജ് ചെയ്യുന്നു (പൂർണ്ണമാകാൻ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • വേഗത്തിൽ ചാർജ് ചെയ്യുന്നു (പൂർണ്ണമാകാൻ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • പതുക്കെ ചാർജ് ചെയ്യുന്നു (പൂർണ്ണമാകാൻ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ചാർജ് ചെയ്യുന്നു (പൂർണ്ണമാകാൻ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • വേഗത്തിൽ ചാർജ് ചെയ്യുന്നു (പൂർണ്ണമാകാൻ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • പതുക്കെ ചാർജ് ചെയ്യുന്നു (പൂർണ്ണമാകാൻ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ഉപയോക്താവ് മാറുക"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ഉപയോക്താവിനെ മാറ്റുക, <xliff:g id="CURRENT_USER_NAME">%s</xliff:g> എന്നയാളാണ് നിലവിലുള്ള ഉപയോക്താവ്"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"നിലവിലെ ഉപയോക്താവ് <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ഉപയോക്താവിനെ ലോഗൗട്ട് ചെയ്യുക"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"പുതിയ ഉപയോക്താവിനെ ചേർക്കണോ?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"നിങ്ങൾ ഒരു പുതിയ ഉപയോക്താവിനെ ചേർക്കുമ്പോൾ, ആ വ്യക്തിക്ക് അവരുടെ ഇടം സജ്ജീകരിക്കേണ്ടതുണ്ട്.\n\nമറ്റ് എല്ലാ ഉപയോക്താക്കൾക്കുമായി ഏതൊരു ഉപയോക്താവിനും അപ്ലിക്കേഷനുകൾ അപ്‌ഡേറ്റ് ചെയ്യാനാവും."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"ഉപയോക്താവിനെ ഇല്ലാതാക്കണോ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"ഈ ഉപയോക്താവിന്റെ എല്ലാ ആപ്സും ഡാറ്റയും ഇല്ലാതാക്കും."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"നീക്കംചെയ്യുക"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"ഇടതുവശത്തെ ചിഹ്നം"</string>
     <string name="right_icon" msgid="3952104823293824311">"വലതുവശത്തെ ചിഹ്നം"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ടൈലുകൾ ചേർക്കാൻ ക്ലിക്ക് ചെയ്ത് ഇഴയ്‌ക്കുക"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"നീക്കംചെയ്യുന്നതിന് ഇവിടെ വലിച്ചിടുക"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"നിങ്ങൾക്ക് ചുരുങ്ങിയത് 6 ടൈലുകൾ വേണം"</string>
     <string name="qs_edit" msgid="2232596095725105230">"എഡിറ്റുചെയ്യുക"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"താഴെ പൂർണ്ണ സ്ക്രീൻ"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"സ്ഥാനം <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. എഡിറ്റുചെയ്യുന്നതിന് രണ്ടുതവണ ടാപ്പുചെയ്യുക."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. ചേർക്കാൻ രണ്ടുതവണ ടാപ്പുചെയ്യുക."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"സ്ഥാനം <xliff:g id="POSITION">%1$d</xliff:g>. തിരഞ്ഞെടുക്കാൻ രണ്ടുതവണ ടാപ്പുചെയ്യുക."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> നീക്കുക"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> നീക്കംചെയ്യുക"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"സ്ഥാനം <xliff:g id="POSITION">%2$d</xliff:g>-ലേക്ക് <xliff:g id="TILE_NAME">%1$s</xliff:g> ചേർക്കുന്നു"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> നീക്കംചെയ്യുന്നു"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"സ്ഥാനം <xliff:g id="POSITION">%2$d</xliff:g>-ലേക്ക് <xliff:g id="TILE_NAME">%1$s</xliff:g> നീക്കി"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="POSITION">%2$d</xliff:g> സ്ഥാനത്തേയ്ക്ക് <xliff:g id="TILE_NAME">%1$s</xliff:g> ചേർക്കുക"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="POSITION">%2$d</xliff:g> സ്ഥാനത്തേയ്ക്ക് <xliff:g id="TILE_NAME">%1$s</xliff:g> നീക്കുക"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ദ്രുത ക്രമീകരണ എഡിറ്റർ."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> അറിയിപ്പ്: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"സ്പ്ലിറ്റ്-സ്ക്രീനിനൊപ്പം ആപ്പ് പ്രവർത്തിച്ചേക്കില്ല."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ആപ്പ് വിവരം"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ബ്രൗസറിലേക്ക് പോവുക"</string>
     <string name="mobile_data" msgid="7094582042819250762">"മൊബൈൽ ഡാറ്റ"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"വൈഫൈ ഓഫാണ്"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth ഓഫാണ്"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\'ശല്യപ്പെടുത്തരുത്\' ഓഫാണ്"</string>
diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml
index fb26e81..8e27efe 100644
--- a/packages/SystemUI/res/values-mn/strings.xml
+++ b/packages/SystemUI/res/values-mn/strings.xml
@@ -32,8 +32,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Мэдэгдэл"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Батaрей удахгүй дуусaж болзошгүй"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> үлдсэн"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> үлдсэн байна. Таны хэрэглээнд тулгуурлан ойролцоогоор <xliff:g id="TIME">%s</xliff:g>-н хугацаа үлдсэн"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> үлдсэн байна. Ойролцоогоор <xliff:g id="TIME">%s</xliff:g>-н хугацаа үлдсэн"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> үлдсэн байна. Таны хэрэглээнд тулгуурлан ойролцоогоор <xliff:g id="TIME">%2$s</xliff:g>-н хугацаа үлдсэн"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> үлдсэн байна. Ойролцоогоор <xliff:g id="TIME">%2$s</xliff:g>-н хугацаа үлдсэн"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> үлдсэн. Тэжээл хэмнэгч асаалттай байна."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB-р цэнэглэх боломжгүй байна. Төхөөрөмждөө дагалдаж ирсэн цэнэглэгчийг ашиглана уу."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB-р цэнэглэх боломжгүй байна"</string>
@@ -255,7 +255,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Байршлын хүсэлтүүд идэвхтэй"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Бүх мэдэгдлийг цэвэрлэх."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">дотор бусад <xliff:g id="NUMBER_1">%s</xliff:g> мэдэгдэл байна.</item>
       <item quantity="one">дотор бусад <xliff:g id="NUMBER_0">%s</xliff:g> мэдэгдэл байна.</item>
@@ -397,9 +397,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Дуугүй\nболгох"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Зөвхөн\nхамгийн чухлыг"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Зөвхөн\nсэрүүлэг"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Цэнэглэж байна (дүүргэхэд <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> шаардлагатай)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Хурдан цэнэглэж байна (дүүргэхэд <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> шаардлагатай)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Удаан цэнэглэж байна (дүүргэхэд <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> шаардлагатай)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Цэнэглэж байна (дүүргэхэд <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> шаардлагатай)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Хурдан цэнэглэж байна (дүүргэхэд <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> шаардлагатай)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Удаан цэнэглэж байна (дүүргэхэд <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> шаардлагатай)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Хэрэглэгчийг сэлгэх"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Хэрэглэгчийг сэлгэх, одоогийн хэрэглэгч <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Одоогийн хэрэглэгч <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -424,6 +424,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ХЭРЭГЛЭГЧЭЭС ГАРАХ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Шинэ хэрэглэгч нэмэх үү?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Та шинэ хэрэглэгч нэмбэл тухайн хүн өөрийн профайлыг тохируулах шаардлагатай.\n\nАль ч хэрэглэгч бүх хэрэглэгчийн апп-уудыг шинэчлэх боломжтой."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Хэрэглэгчийг устгах уу?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Энэ хэрэглэгчийн бүх апп болон мэдээлэл устах болно."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Арилгах"</string>
@@ -727,6 +730,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Зүүн дүрс тэмдэг"</string>
     <string name="right_icon" msgid="3952104823293824311">"Баруун дүрс тэмдэг"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Хавтанд нэмэхийн тулд дараад чирэх"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Устгахын тулд энд зөөнө үү"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Танд хамгийн багадаа 6 хавтан шаардлагатай"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Засах"</string>
@@ -755,12 +760,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Доод бүтэн дэлгэц"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Байршил <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Засахын тулд 2 удаа дарна уу."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Нэмэхийн тулд 2 удаа дарна уу."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Албан тушаал <xliff:g id="POSITION">%1$d</xliff:g>. Сонгохын тулд 2 удаа дарна уу."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-г зөөх"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-г устгах"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-г <xliff:g id="POSITION">%2$d</xliff:g> байршилд нэмсэн"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-г устгасан"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-г <xliff:g id="POSITION">%2$d</xliff:g> байршилд зөөсөн"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-г <xliff:g id="POSITION">%2$d</xliff:g> байрлалд нэмэх"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g>-г байрлал <xliff:g id="POSITION">%2$d</xliff:g> руу зөөх"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Түргэн тохиргоо засварлагч."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> мэдэгдэл: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Апп хуваагдсан дэлгэцэд ажиллахгүй."</string>
@@ -821,7 +824,7 @@
     <string name="app_info" msgid="6856026610594615344">"Апп-н мэдээлэл"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Хөтчид очих"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Мобайл дата"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi унтраалттай байна"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth унтраалттай байна"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Бүү саад бол горим унтраалттай байна"</string>
diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml
index 958a877..1c16dc2 100644
--- a/packages/SystemUI/res/values-mr/strings.xml
+++ b/packages/SystemUI/res/values-mr/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"सूचना"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"बॅटरी लवकर संपू शकते"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> शिल्लक"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> बाकी, तुमच्या वापरावर आधारित सुमारे <xliff:g id="TIME">%s</xliff:g> शिल्लक"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> बाकी, सुमारे <xliff:g id="TIME">%s</xliff:g> शिल्लक"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> बाकी, तुमच्या वापरावर आधारित सुमारे <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> बाकी, सुमारे <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> शिल्लक. बॅटरी सेव्‍हर चालू आहे."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB द्वारे चार्ज करू शकत नाही. तुमच्या डिव्हाइससह आलेल्‍या चार्जरचा वापर करा."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB द्वारे चार्ज होऊ शकत नाही"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"स्थान विनंत्या सक्रिय"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"सर्व सूचना साफ करा."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">आत आणखी <xliff:g id="NUMBER_1">%s</xliff:g> सूचना.</item>
       <item quantity="other">आत आणखी <xliff:g id="NUMBER_1">%s</xliff:g> सूचना.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"संपूर्ण\nशांतता"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"केवळ\nप्राधान्य"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"केवळ\nअलार्म"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • चार्ज होत आहे (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> मध्ये पूर्ण होईल)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • वेगाने चार्ज होत आहे (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> मध्ये पूर्ण होईल)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • सावकाश चार्ज होत आहे (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> मध्ये पूर्ण होईल)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • चार्ज होत आहे (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> मध्ये पूर्ण होईल)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • वेगाने चार्ज होत आहे (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> मध्ये पूर्ण होईल)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • सावकाश चार्ज होत आहे (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> मध्ये पूर्ण होईल)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"वापरकर्ता स्विच करा"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"वापरकर्ता स्विच करा, वर्तमान वापरकर्ता <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"वर्तमान वापरकर्ता <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"वापरकर्त्यास लॉगआउट करा"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"नवीन वापरकर्ता जोडायचा?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"तुम्ही एक नवीन वापरकर्ता जोडता तेव्हा, त्या व्यक्तीने त्यांचे स्थान सेट करणे आवश्यक असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अॅप्स अपडेट करू शकतो."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"वापरकर्त्यास काढायचे?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"या वापरकर्त्याचे सर्व अॅप्स आणि डेटा काढून टाकला जाईल."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"काढा"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"डावे आयकन"</string>
     <string name="right_icon" msgid="3952104823293824311">"उजवे आयकन"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"टाइल जोडण्यासाठी धरून ठेवा आणि ड्रॅग करा"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"काढण्यासाठी येथे ड्रॅग करा"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"तुम्हाला किमान ६ टाइलची गरज आहे"</string>
     <string name="qs_edit" msgid="2232596095725105230">"संपादित करा"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"तळाशी पूर्ण स्क्रीन"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"स्थिती <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. संपादित करण्यासाठी दोनदा टॅप करा."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g> . जोडण्यासाठी दोनदा टॅप करा."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"स्थिती <xliff:g id="POSITION">%1$d</xliff:g>. निवडण्यासाठी दोनदा टॅप करा."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> हलवा"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> काढा"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ला <xliff:g id="POSITION">%2$d</xliff:g> स्थितीवर जोडले आहे"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ला काढले आहे"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ला <xliff:g id="POSITION">%2$d</xliff:g> स्थितीवर हलविले"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g> स्थानावर जोडा"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g> स्थानावर हलवा"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"द्रुत सेटिंग्ज संपादक."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> सूचना: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"अॅप कदाचित विभाजित-स्क्रीनसह कार्य करू शकत नाही."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"अॅप माहिती"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ब्राउझरवर जा"</string>
     <string name="mobile_data" msgid="7094582042819250762">"मोबाइल डेटा"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"वाय-फाय बंद आहे"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ब्लूटूथ बंद आहे"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"व्यत्यय आणू नका बंद आहे"</string>
diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml
index 18007c2..947c0ff 100644
--- a/packages/SystemUI/res/values-ms/strings.xml
+++ b/packages/SystemUI/res/values-ms/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Pemberitahuan"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Bateri mungkin kehabisan tidak lama lagi"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> yang tinggal"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Tinggal <xliff:g id="PERCENTAGE">%s</xliff:g>, kira-kira <xliff:g id="TIME">%s</xliff:g> lagi berdasarkan penggunaan anda"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Tinggal <xliff:g id="PERCENTAGE">%s</xliff:g>, kira-kira <xliff:g id="TIME">%s</xliff:g> lagi"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Tinggal <xliff:g id="PERCENTAGE">%1$s</xliff:g>, kira-kira <xliff:g id="TIME">%2$s</xliff:g> lagi berdasarkan penggunaan anda"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Tinggal <xliff:g id="PERCENTAGE">%1$s</xliff:g>, kira-kira <xliff:g id="TIME">%2$s</xliff:g> lagi"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Tinggal <xliff:g id="PERCENTAGE">%s</xliff:g>. Penjimat Bateri dihidupkan."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Tidak dapat mengecas melalui USB. Gunakan pengecas yang disertakan dengan peranti anda."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Tidak dapat mengecas melalui USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Permintaan lokasi aktif"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Padamkan semua pemberitahuan."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> lagi pemberitahuan di dalam.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> lagi pemberitahuan di dalam.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Senyap\nsepenuhnya"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Keutamaan\nsahaja"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Penggera\nsahaja"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengecas (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hingga penuh)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengecas dengan cepat (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hingga penuh)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengecas dengan perlahan (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hingga penuh)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengecas (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> hingga penuh)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengecas dengan cepat (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> hingga penuh)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengecas dengan perlahan (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> hingga penuh)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Tukar pengguna"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Tukar pengguna, pengguna semasa <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Pengguna semasa <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"LOG KELUAR PENGGUNA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Tambah pengguna baharu?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Apabila anda menambah pengguna baharu, orang itu perlu menyediakan ruang mereka.\n\nMana-mana pengguna boleh mengemas kini apl untuk semua pengguna lain."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Alih keluar pengguna?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Semua apl dan data pengguna ini akan dipadamkan."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Alih keluar"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ikon kiri"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ikon kanan"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Tahan dan seret untuk menambah jubin"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Seret ke sini untuk mengalih keluar"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Anda memerlukan sekurang-kurangnya 6 jubin"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Edit"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Skrin penuh bawah"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Kedudukan <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Dwiketik untuk mengedit."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Dwiketik untuk menambah."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Kedudukan <xliff:g id="POSITION">%1$d</xliff:g>. Dwiketik untuk memilih."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Alihkan <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Alih keluar <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ditambahkan pada kedudukan <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> dialih keluar"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> dialihkan ke kedudukan <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Tambahkan <xliff:g id="TILE_NAME">%1$s</xliff:g> pada kedudukan <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Alihkan <xliff:g id="TILE_NAME">%1$s</xliff:g> ke kedudukan <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor tetapan pantas."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Pemberitahuan <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Apl mungkin tidak berfungsi dengan skrin pisah."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Maklumat apl"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Pergi ke penyemak imbas"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Data mudah alih"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi dimatikan"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth dimatikan"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Jangan Ganggu dimatikan"</string>
diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml
index f1d48b9..8264240 100644
--- a/packages/SystemUI/res/values-my/strings.xml
+++ b/packages/SystemUI/res/values-my/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"အကြောင်းကြားချက်များ။"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"မကြာမီ ဘက်ထရီကုန်သွားနိုင်ပါသည်"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> ကျန်ရှိနေ"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> ကျန်သည်၊ သင့်အသုံးပြုမှုအရ <xliff:g id="TIME">%s</xliff:g> ခန့် ကျန်ပါသည်"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> ကျန်သည်၊ <xliff:g id="TIME">%s</xliff:g> ခန့် ကျန်ပါသည်"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ကျန်သည်၊ သင့်အသုံးပြုမှုအရ <xliff:g id="TIME">%2$s</xliff:g> ခန့် ကျန်ပါသည်"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ကျန်သည်၊ <xliff:g id="TIME">%2$s</xliff:g> ခန့် ကျန်ပါသည်"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> ကျန်ပါတယ်။ ဘက်ထရီ အားထိန်းကို ဖွင့်ထားသည်။"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB ဖြင့် အားသွင်း၍မရပါ။ သင့်စက်ပစ္စည်းနှင့် အတူပါလာသည့် အားသွင်းကိရိယာကို အသုံးပြုပါ။"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB ဖြင့် အားသွင်း၍မရပါ"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"တည်နေရာပြ တောင်းဆိုချက်များ အသက်ဝင်ရန်"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"သတိပေးချက်အားလုံးအား ဖယ်ရှားခြင်း။"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>၊ +<xliff:g id="OVERFLOW">%s</xliff:g> ခု"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>၊ +<xliff:g id="OVERFLOW">%2$s</xliff:g> ခု"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">အတွင်းတွင် အကြောင်းကြားချက် နောက်ထပ် <xliff:g id="NUMBER_1">%s</xliff:g> ခုရှိပါသည်။</item>
       <item quantity="one">အတွင်းတွင် အကြောင်းကြားချက် နောက်ထပ် <xliff:g id="NUMBER_0">%s</xliff:g> ခုရှိပါသည်။</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"လုံးဝ\nတိတ်ဆိတ်ခြင်း"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"ဦးစားပေးမှု\nသာ"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"နှိုးစက်များ\nသာ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • အားသွင်းနေသည် (အားပြည့်ရန် <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> လို)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • အမြန်အားသွင်းနေသည် (အားပြည့်ရန် <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> လို)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • နှေးကွေးစွာ သွင်းနေသည် (အားပြည့်ရန် <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> လို)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • အားသွင်းနေသည် (အားပြည့်ရန် <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> လို)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • အမြန်အားသွင်းနေသည် (အားပြည့်ရန် <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> လို)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • နှေးကွေးစွာ သွင်းနေသည် (အားပြည့်ရန် <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> လို)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"အသုံးပြုသူကို ပြောင်းလဲရန်"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"အသုံးပြုသူကို ပြောင်းရန်၊ လက်ရှိ အသုံးပြုသူ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"လတ်တလော သုံးစွဲသူ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"အသုံးပြုသူ ထွက်လိုက်ပါ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"အသုံးပြုသူအသစ်ကို ထည့်မလား။"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"သင်ထည့်လိုက်သော အသုံးပြုသူအသစ်သည် ၎င်း၏နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်သည်။\n\nမည်သည့်အသုံးပြုသူမဆို ကျန်သူများအားလုံးအတွက် အက်ပ်များကို အပ်ဒိတ်လုပ်ပေးနိုင်သည်။"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"သုံးစွဲသူကိုဖယ်ရှားမည်လား?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"ဤအသုံးပြုသူ၏ ဒေတာနှင့် အပ်ဖ်များအားလုံး ဖျက်လိုက်ပါမည်"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"ဖယ်ရှားရန်"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"လက်ဝဲသင်္ကေတ"</string>
     <string name="right_icon" msgid="3952104823293824311">"လက်ယာသင်္ကေတ"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"အကွက်များထည့်ရန် ဖိဆွဲပါ"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ဖယ်ရှားရန် ဤနေရာသို့ဖိဆွဲပါ"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"အနည်းဆုံး ၆ ကွက် ရှိရမည်"</string>
     <string name="qs_edit" msgid="2232596095725105230">"တည်းဖြတ်ပါ"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"အောက်ခြေ မျက်နှာပြင်အပြည့်"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g>၊ <xliff:g id="TILE_NAME">%2$s</xliff:g> နေရာ။ တည်းဖြတ်ရန် နှစ်ချက်တို့ပါ။"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>။ ပေါင်းထည့်ရန် နှစ်ချက်တို့ပါ။"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g> နေရာ။ ရွေးချယ်ရန် နှစ်ချက်တို့ပါ။"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ကိုရွှေ့ပါ"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ကိုဖယ်ရှားပါ"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ကို <xliff:g id="POSITION">%2$d</xliff:g> နေရာသို့ ပေါင်းထည့်ထားပါသည်"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ကိုဖယ်ရှားလိုက်ပါပြီ"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ကို <xliff:g id="POSITION">%2$d</xliff:g> နေရာသို့ ရွှေ့လိုက်ပါပြီ"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ကို အနေအထား <xliff:g id="POSITION">%2$d</xliff:g> သို့ ပေါင်းထည့်ရန်"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ကို အနေအထား <xliff:g id="POSITION">%2$d</xliff:g> သို့ ရွှေ့ရန်"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"မြန်ဆန်သည့် ဆက်တင်တည်းဖြတ်စနစ်"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> အကြောင်းကြားချက် − <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"မျက်နှာပြင် ခွဲခြမ်းပြသမှုဖြင့် အက်ပ်သည် အလုပ်လုပ်မည် မဟုတ်ပါ။"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"အက်ပ်အချက်အလက်"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ဘရောင်ဇာသို့ သွားပါ"</string>
     <string name="mobile_data" msgid="7094582042819250762">"မိုဘိုင်းဒေတာ"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> —<xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> —<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ကို ပိတ်ထားသည်"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ဘလူးတုသ်ကို ပိတ်ထားသည်"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\"မနှောင့်ယှက်ရ\" ကို ပိတ်ထားသည်"</string>
diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml
index 6af41ff..8c8e905 100644
--- a/packages/SystemUI/res/values-nb/strings.xml
+++ b/packages/SystemUI/res/values-nb/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Varsler"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Batteriet går kanskje snart tomt"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> gjenstår"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> gjenstår, omtrent <xliff:g id="TIME">%s</xliff:g> igjen basert på bruken din"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> gjenstår, omtrent <xliff:g id="TIME">%s</xliff:g> igjen"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> gjenstår, omtrent <xliff:g id="TIME">%2$s</xliff:g> igjen basert på bruken din"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> gjenstår, omtrent <xliff:g id="TIME">%2$s</xliff:g> igjen"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> gjenstår. Batterisparing er på."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Kan ikke lade via USB. Bruk laderen som fulgte med enheten."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Kan ikke lade via USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Aktive stedsforespørsler"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Fjern alle varslinger."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> andre varsler i gruppen.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> annet varsel i gruppen.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Total\nstillhet"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Bare\nPrioritet"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Bare\nalarmer"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lader (fulladet om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lader raskt (fulladet om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lader sakte (fulladet om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lader (fulladet om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lader raskt (fulladet om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lader sakte (fulladet om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Bytt bruker"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Bytt bruker, gjeldende bruker er <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Gjeldende bruker: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"LOGG UT BRUKER"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Vil du legge til en ny bruker?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Når du legger til en ny bruker, må vedkommende konfigurere sitt eget område.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Vil du fjerne brukeren?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Alle apper og data som tilhører denne brukeren, blir slettet."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Fjern"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Venstre-ikon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Høyre-ikon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Hold og dra for å legge til ruter"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Dra hit for å fjerne"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Du trenger minst seks ruter"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Endre"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Utvid den nederste delen av skjermen til hele skjermen"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Plassering <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Dobbelttrykk for å endre."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Dobbelttrykk for å legge til."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Plassering <xliff:g id="POSITION">%1$d</xliff:g>. Dobbelttrykk for å velge."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Flytt <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Fjern <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> er lagt til i plassering <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> er fjernet"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> er flyttet til plassering <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Legg til <xliff:g id="TILE_NAME">%1$s</xliff:g> i posisjon <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Flytt <xliff:g id="TILE_NAME">%1$s</xliff:g> til posisjon <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Redigeringsvindu for hurtiginnstillinger."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g>-varsel: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Det kan hende at appen ikke fungerer med delt skjerm."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Info om appen"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Gå til nettleser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobildata"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi er av"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth er av"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Ikke forstyrr er av"</string>
diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml
index 5cd4325..1b8149e 100644
--- a/packages/SystemUI/res/values-ne/strings.xml
+++ b/packages/SystemUI/res/values-ne/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"सूचनाहरू"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ब्याट्री चाँडै सकिन सक्छ"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> बाँकी"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> बाँकी, तपाईंको प्रयोगका आधारमा करिब <xliff:g id="TIME">%s</xliff:g> बाँकी छ"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> बाँकी, करिब <xliff:g id="TIME">%s</xliff:g> बाँकी छ"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> बाँकी, तपाईंको प्रयोगका आधारमा करिब <xliff:g id="TIME">%2$s</xliff:g> बाँकी छ"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> बाँकी, करिब <xliff:g id="TIME">%2$s</xliff:g> बाँकी छ"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> बाँकी। ब्याट्री सेभर सक्रिय छ।"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB मार्फत चार्ज गर्न सकिँदैन। तपाईंको यन्त्रसँगै आएको चार्जर प्रयोग गर्नुहोस्‌।"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB मार्फत चार्ज गर्न सकिँदैन"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"स्थान अनुरोधहरू सक्रिय"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"सबै सूचनाहरू हटाउनुहोस्।"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">भित्र थप <xliff:g id="NUMBER_1">%s</xliff:g> सूचनाहरू छन्।</item>
       <item quantity="one">भित्र थप <xliff:g id="NUMBER_0">%s</xliff:g> सूचना छ।</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"पूरै\nशान्त"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"प्राथमिकता \nमात्र"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"अलार्महरू \nमात्र"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • चार्ज गरिँदै (चार्ज पूरा हुन <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> बाँकी)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • द्रुत गतिमा चार्ज गरिँदै (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> समय बाँकी)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • मन्द गतिमा चार्ज गरिँदै (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> समय बाँकी)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • चार्ज गरिँदै (चार्ज पूरा हुन <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> बाँकी)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • द्रुत गतिमा चार्ज गरिँदै (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> समय बाँकी)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • मन्द गतिमा चार्ज गरिँदै (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> समय बाँकी)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"प्रयोगकर्ता फेर्नुहोस्"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"प्रयोगकर्ता, हालको प्रयोगकर्ता <xliff:g id="CURRENT_USER_NAME">%s</xliff:g> मा स्विच गर्नुहोस्"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"हालको प्रयोगकर्ता <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"प्रयोगकर्ता लगआउट गर्नुहोस्"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"नयाँ प्रयोगकर्ता थप्ने हो?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"जब तपाईँले नयाँ प्रयोगकर्ता थप्नुहुन्छ, त्यस प्रयोगकर्ताले आफ्नो स्थान स्थापना गर्न पर्ने छ।\n\nकुनै पनि प्रयोगकर्ताले सबै अन्य प्रयोगकर्ताहरूका लागि अनुप्रयोगहरू अद्यावधिक गर्न सक्छन्।"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"प्रयोगकर्ता हटाउन चाहनुहुन्छ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"यस प्रयोगकर्ताको सबै अनुप्रयोगहरू तथा डेटा हटाइनेछ।"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"हटाउनुहोस्"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"बायाँतिर देखाउने आइकन"</string>
     <string name="right_icon" msgid="3952104823293824311">"दायाँतिरको आइकन"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"टाइलहरू थप्न होल्ड गरी ड्र्याग गर्नुहोस्"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"हटाउनका लागि यहाँ तान्नुहोस्"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"तपाईंलाई कम्तीमा ६ वटा टाइलहरू चाहिन्छ"</string>
     <string name="qs_edit" msgid="2232596095725105230">"सम्पादन गर्नुहोस्"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"तल्लो भाग पूर्ण स्क्रिन"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"स्थिति <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>। सम्पादन गर्नाका लागि डबल ट्याप गर्नुहोस्।"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>। थप्नका लागि डबल ट्याप गर्नुहोस्।"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"स्थिति <xliff:g id="POSITION">%1$d</xliff:g>। चयन गर्नाका लागि डबल ट्याप गर्नुहोस्।"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> लाई सार्नुहोस्"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> लाई हटाउनुहोस्"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> लाई स्थिति <xliff:g id="POSITION">%2$d</xliff:g> मा थपियो"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> लाई हटाइयो"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> लाई स्थिति <xliff:g id="POSITION">%2$d</xliff:g> मा सारियो"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> लाई <xliff:g id="POSITION">%2$d</xliff:g> स्थितिमा थप्नुहोस्"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> लाई <xliff:g id="POSITION">%2$d</xliff:g> स्थितिमा सार्नुहोस्"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"द्रुत सेटिङ सम्पादक।"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> को सूचना: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"अनुप्रयोगले विभाजित-स्क्रिनमा काम नगर्न सक्छ।"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"अनुप्रयोगका बारे जानकारी"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ब्राउजरमा जानुहोस्"</string>
     <string name="mobile_data" msgid="7094582042819250762">"मोबाइल डेटा"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi‑Fi निष्क्रिय छ"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ब्लुटुथ निष्क्रिय छ"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"बाधा नपुर्‍याउनुहोस् नामक विकल्प निष्क्रिय छ"</string>
diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml
index 1ec5c10..61dba4a 100644
--- a/packages/SystemUI/res/values-nl/strings.xml
+++ b/packages/SystemUI/res/values-nl/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Meldingen"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Batterij is bijna leeg"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> resterend"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> resterend, nog ongeveer <xliff:g id="TIME">%s</xliff:g> over op basis van je gebruik"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> resterend, nog ongeveer <xliff:g id="TIME">%s</xliff:g> over"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> resterend, nog ongeveer <xliff:g id="TIME">%2$s</xliff:g> over op basis van je gebruik"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> resterend, nog ongeveer <xliff:g id="TIME">%2$s</xliff:g> over"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> resterend. Batterijbesparing is ingeschakeld."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Kan niet opladen via USB. Gebruik de oplader die bij je apparaat is geleverd."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Kan niet opladen via USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Locatieverzoeken actief"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Alle meldingen wissen."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Nog <xliff:g id="NUMBER_1">%s</xliff:g> meldingen in deze groep.</item>
       <item quantity="one">Nog <xliff:g id="NUMBER_0">%s</xliff:g> melding in deze groep.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Totale\nstilte"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Alleen\nprioriteit"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alleen\nalarmen"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Opladen (vol over <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Snel opladen (vol over <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Langzaam opladen (vol over <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Opladen (vol over <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Snel opladen (vol over <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Langzaam opladen (vol over <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Gebruiker wijzigen"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Schakelen tussen gebruikers, huidige gebruiker <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Huidige gebruiker <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"GEBRUIKER UITLOGGEN"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Nieuwe gebruiker toevoegen?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Wanneer u een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen.\n\nElke gebruiker kan apps updaten voor alle andere gebruikers."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Gebruiker verwijderen?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Alle apps en gegevens van deze gebruiker worden verwijderd."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Verwijderen"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Pictogram links"</string>
     <string name="right_icon" msgid="3952104823293824311">"Pictogram rechts"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Houd vast en sleep om tegels toe te voegen"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Sleep hier naartoe om te verwijderen"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Je hebt minimaal zes tegels nodig"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Bewerken"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Onderste scherm op volledig scherm"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Positie <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Dubbeltik om te bewerken."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Dubbeltik om toe te voegen."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Positie <xliff:g id="POSITION">%1$d</xliff:g>. Dubbeltik om te selecteren."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> verplaatsen"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> verwijderen"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is toegevoegd op positie <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is verwijderd"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> is verplaatst naar positie <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> toevoegen aan positie <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> verplaatsen naar positie <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor voor \'Snelle instellingen\'."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g>-melding: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"App werkt mogelijk niet met gesplitst scherm."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"App-info"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Ga naar browser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobiele data"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wifi is uitgeschakeld"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth is uitgeschakeld"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\'Niet storen\' is uitgeschakeld"</string>
diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml
index 8ac9f5f..7f79090 100644
--- a/packages/SystemUI/res/values-or/strings.xml
+++ b/packages/SystemUI/res/values-or/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"ବିଜ୍ଞପ୍ତି"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ଖୁବ୍ ଶୀଘ୍ର ବ୍ୟାଟେରୀ ସରିଯାଇପାରେ"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> ବାକି ଅଛି"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> ବଳକା ଅଛି, ଆପଣଙ୍କ ବ୍ୟବହାର ଅନୁସାରେ ବ୍ୟାଟେରୀ ପାଖାପାଖି <xliff:g id="TIME">%s</xliff:g> ସମୟ ଚାଲିବ"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> ବଳକା ଅଛି, <xliff:g id="TIME">%s</xliff:g> ସମୟ ଚାଲିପାରେ"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ବଳକା ଅଛି, ଆପଣଙ୍କ ବ୍ୟବହାର ଅନୁସାରେ ବ୍ୟାଟେରୀ ପାଖାପାଖି <xliff:g id="TIME">%2$s</xliff:g> ସମୟ ଚାଲିବ"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ବଳକା ଅଛି, <xliff:g id="TIME">%2$s</xliff:g> ସମୟ ଚାଲିପାରେ"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> ବାକି ଅଛି। ବ୍ୟାଟେରୀ ସେଭର୍‌ ଅନ୍‍ ଅଛି।"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB ଦ୍ଵାରା ଚାର୍ଜ କରିହେବନାହିଁ। ଆପଣଙ୍କ ଡିଭାଇସ୍ ପାଇଁ ଥିବା ଚାର୍ଜର୍‌କୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB ଦ୍ଵାରା ଚାର୍ଜ କରିହେବନାହିଁ"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"ଲୋକେଶନ୍‍ ଅନୁରୋଧ ସକ୍ରିୟ ଅଛି"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"ସମସ୍ତ ବିଜ୍ଞପ୍ତି ଖାଲି କରନ୍ତୁ।"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">ଭିତରେ ଆଉ <xliff:g id="NUMBER_1">%s</xliff:g>ଟି ଅଧିକ ବିଜ୍ଞପ୍ତି ରହିଛି।</item>
       <item quantity="one">ଭିତରେ ଆଉ <xliff:g id="NUMBER_0">%s</xliff:g>ଟି ଅଧିକ ବିଜ୍ଞପ୍ତି ରହିଛି।</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"ସମ୍ପୂର୍ଣ୍ଣ\nନୀରବ"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"କେବଳ\nପ୍ରାଥମିକତା"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"କେବଳ\nଆଲାର୍ମ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ଚାର୍ଜ ହେଉଛି (ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ବଳକା ଅଛି)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ଶୀଘ୍ର ଚାର୍ଜ ହେଉଛି (ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ବଳକା ଅଛି)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ଧୀରେ ଚାର୍ଜ ହେଉଛି (ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ବଳକା ଅଛି)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ଚାର୍ଜ ହେଉଛି (ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ବଳକା ଅଛି)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ଶୀଘ୍ର ଚାର୍ଜ ହେଉଛି (ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ବଳକା ଅଛି)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ଧୀରେ ଚାର୍ଜ ହେଉଛି (ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ବଳକା ଅଛି)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ୟୁଜର୍‍ ବଦଳାନ୍ତୁ"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ୟୁଜର୍‍ ବଦଳାନ୍ତୁ, ବର୍ତ୍ତମାନର ୟୁଜର୍‍ ହେଉଛନ୍ତି <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"ବର୍ତ୍ତମାନର ୟୁଜର୍‍ ହେଉଛନ୍ତି <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ୟୁଜରଙ୍କୁ ଲଗଆଉଟ୍‍ କରନ୍ତୁ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"ନୂତନ ୟୁଜର୍‍ ଯୋଡ଼ିବେ?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"ଜଣେ ନୂଆ ୟୁଜର୍‍ଙ୍କୁ ଯୋଡ଼ିବାବେଳେ, ସେହି ବ୍ୟକ୍ତିଙ୍କୁ ସ୍ଥାନ ସେଟ୍‍ କରିବାକୁ ପଡ଼ିବ। \n \n ଅନ୍ୟ ସମସ୍ତ ୟୁଜର୍‍ଙ୍କ ପାଇଁ ଯେକୌଣସି ୟୁଜର୍‍ ଆପ୍‌ଗୁଡ଼ିକୁ ଅପଡେଟ୍‌ କରିପାରିବେ।"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"ୟୁଜରଙ୍କୁ ବାହାର କରିବେ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"ଏହି ୟୁଜରଙ୍କ ସମସ୍ତ ଆପ୍‍ ଓ ଡାଟା ଡିଲିଟ୍‍ ହେବ।"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"ବାହାର କରନ୍ତୁ"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"ବାମ ଆଇକନ୍‍"</string>
     <string name="right_icon" msgid="3952104823293824311">"ଡାହାଣ ଆଇକନ୍"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ଟାଇଲ୍ ଯୋଡ଼ିବା ପାଇଁ ଦାବିଧରି ଟାଣନ୍ତୁ"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ବାହାର କରିବାକୁ ଏଠାକୁ ଡ୍ରାଗ୍‍ କରନ୍ତୁ"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"ଆପଣଙ୍କର ଅତିକମରେ 6ଟି ଟାଇଲ୍ ଆବଶ୍ୟକ"</string>
     <string name="qs_edit" msgid="2232596095725105230">"ଏଡିଟ୍‌ କରନ୍ତୁ"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"ତଳ ଅଂଶର ପୂର୍ଣ୍ଣ ସ୍କ୍ରୀନ୍‍"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ଅବସ୍ଥାନ <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>। ଏଡିଟ୍ କରିବାକୁ ଡବଲ୍‍-ଟାପ୍‍ କରନ୍ତୁ।"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>। ଯୋଡ଼ିବା ପାଇଁ ଡବଲ୍‍-ଟାପ୍‍ କରନ୍ତୁ।"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ଅବସ୍ଥିତି <xliff:g id="POSITION">%1$d</xliff:g>। ଚୟନ କରିବାକୁ ଡବଲ୍‍-ଟାପ୍‍ କରନ୍ତୁ।"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ନିଅନ୍ତୁ"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ବାହାର କରିଦିଅନ୍ତୁ"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g>କୁ ଅବସ୍ଥାନ <xliff:g id="POSITION">%2$d</xliff:g>ରେ ଯୋଡ଼ାଗଲା"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ବାହାର କରିଦିଆଗଲା"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> କୁ ଅବସ୍ଥାନ <xliff:g id="POSITION">%2$d</xliff:g> କୁ ନିଆଗଲା"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="POSITION">%2$d</xliff:g> ଅବସ୍ଥାନକୁ <xliff:g id="TILE_NAME">%1$s</xliff:g> ଯୋଡନ୍ତୁ"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="POSITION">%2$d</xliff:g> ଅବସ୍ଥାନକୁ <xliff:g id="TILE_NAME">%1$s</xliff:g> ଘୁଞ୍ଚାନ୍ତୁ"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ଦ୍ରୁତ ସେଟିଙ୍ଗ ଏଡିଟର୍।"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> ବିଜ୍ଞପ୍ତି: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"ସ୍ପ୍ଲିଟ୍‍-ସ୍କ୍ରୀନରେ ଆପ୍‍ କାମ କରିନପାରେ।"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ଆପ୍‍ ସୂଚନା"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ବ୍ରାଉଜର୍‌କୁ ଯାଆନ୍ତୁ"</string>
     <string name="mobile_data" msgid="7094582042819250762">"ମୋବାଇଲ୍‌ ଡାଟା"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"ୱାଇ-ଫାଇ ଅଫ୍‍ ଅଛି"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ବ୍ଲୁ-ଟୂଥ୍‍‌ ଅଫ୍ ଅଛି"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଅଫ୍‍ ଅଛି"</string>
diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml
index f4be71c..c6ec96e 100644
--- a/packages/SystemUI/res/values-pa/strings.xml
+++ b/packages/SystemUI/res/values-pa/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"ਬੈਟਰੀ ਛੇਤੀ ਹੀ ਖਤਮ ਹੋ ਸਕਦੀ ਹੈ"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> ਬਾਕੀ"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> ਬਾਕੀ, ਤੁਹਾਡੀ ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਲਗਭਗ <xliff:g id="TIME">%s</xliff:g> ਬਾਕੀ"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> ਬਾਕੀ, ਲਗਭਗ <xliff:g id="TIME">%s</xliff:g> ਬਾਕੀ"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ਬਾਕੀ, ਤੁਹਾਡੀ ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਲਗਭਗ <xliff:g id="TIME">%2$s</xliff:g> ਬਾਕੀ"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ਬਾਕੀ, ਲਗਭਗ <xliff:g id="TIME">%2$s</xliff:g> ਬਾਕੀ"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> ਬਾਕੀ। ਬੈਟਰੀ ਸੇਵਰ ਚਾਲੂ ਹੈ।"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB ਰਾਹੀਂ ਚਾਰਜ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਆਪਣੇ ਡੀਵਾਈਸ ਦੇ ਨਾਲ ਮਿਲੇ ਚਾਰਜਰ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB ਰਾਹੀਂ ਚਾਰਜ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾ ਬੇਨਤੀਆਂ ਸਕਿਰਿਆ"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਹਟਾਓ।"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> ਅਤੇ <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ਅਤੇ <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">ਅੰਦਰ <xliff:g id="NUMBER_1">%s</xliff:g> ਹੋਰ ਸੂਚਨਾਵਾਂ।</item>
       <item quantity="other">ਅੰਦਰ <xliff:g id="NUMBER_1">%s</xliff:g> ਹੋਰ ਸੂਚਨਾਵਾਂ।</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"ਕੁਲ \n ਚੁੱਪੀ"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"ਕੇਵਲ\nਤਰਜੀਹੀ"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"ਕੇਵਲ\nਅਲਾਰਮ"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ਵਿੱਚ ਮੁਕੰਮਲ)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ਤੇਜ਼ ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ਵਿੱਚ ਮੁਕੰਮਲ)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ਹੌਲੀ ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ਵਿੱਚ ਮੁਕੰਮਲ)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ਵਿੱਚ ਮੁਕੰਮਲ)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ਤੇਜ਼ ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ਵਿੱਚ ਮੁਕੰਮਲ)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ਹੌਲੀ ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ਵਿੱਚ ਮੁਕੰਮਲ)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"ਵਰਤੋਂਕਾਰ ਸਵਿੱਚ ਕਰੋ"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"ਵਰਤੋਂਕਾਰ, ਵਰਤਮਾਨ ਵਰਤੋਂਕਾਰ ਸਵਿੱਚ ਕਰੋ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"ਮੌਜੂਦਾ ਉਪਭੋਗਤਾ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ਉਪਭੋਗਤਾ ਨੂੰ ਲੌਗ ਆਉਟ ਕਰੋ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"ਕੀ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣੀ ਜਗ੍ਹਾ ਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਰਤੋਂਕਾਰ ਹੋਰ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀਆਂ ਐਪਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"ਕੀ ਵਰਤੋਂਕਾਰ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"ਇਸ ਉਪਭੋਗਤਾ ਦੇ ਸਾਰੇ ਐਪਸ ਅਤੇ  ਡਾਟਾ  ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"ਹਟਾਓ"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"ਖੱਬਾ ਪ੍ਰਤੀਕ"</string>
     <string name="right_icon" msgid="3952104823293824311">"ਸੱਜਾ ਪ੍ਰਤੀਕ"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ਟਾਇਲਾਂ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੜ੍ਹ ਕੇ ਰੱਖੋ ਅਤੇ ਘਸੀਟੋ"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ਹਟਾਉਣ ਲਈ ਇੱਥੇ ਘਸੀਟੋ"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ 6 ਟਾਇਲਾਂ ਦੀ ਲੋੜ ਪਵੇਗੀ"</string>
     <string name="qs_edit" msgid="2232596095725105230">"ਸੰਪਾਦਨ ਕਰੋ"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"ਹੇਠਾਂ ਪੂਰੀ ਸਕ੍ਰੀਨ"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ਸਥਿਤੀ <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>। ਸੰਪਾਦਨ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ।"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>। ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ।"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ਸਥਿਤੀ <xliff:g id="POSITION">%1$d</xliff:g>। ਚੁਣਨ ਲਈ ਡਬਲ ਟੈਪ ਕਰੋ।"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ਨੂੰ ਤਬਦੀਲ ਕਰੋ"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ਹਟਾਓ"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ਨੂੰ <xliff:g id="POSITION">%2$d</xliff:g> ਸਥਿਤੀ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ਨੂੰ ਹਟਾਇਆ ਗਿਆ"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ਨੂੰ <xliff:g id="POSITION">%2$d</xliff:g> ਸਥਿਤੀ \'ਤੇ ਤਬਦੀਲ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ਨੂੰ <xliff:g id="POSITION">%2$d</xliff:g> ਸਥਾਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ਨੂੰ <xliff:g id="POSITION">%2$d</xliff:g> ਸਥਾਨ \'ਤੇ ਲਿਜਾਓ"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਸੰਪਾਦਕ।"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> ਸੂਚਨਾ: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਐਪ ਸਪਲਿਟ-ਸਕ੍ਰੀਨ ਨਾਲ ਕੰਮ ਨਾ ਕਰੇ।"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ਐਪ ਜਾਣਕਾਰੀ"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ਬ੍ਰਾਊਜ਼ਰ \'ਤੇ ਜਾਓ"</string>
     <string name="mobile_data" msgid="7094582042819250762">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"ਵਾਈ-ਫਾਈ ਬੰਦ ਹੈ"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"ਬਲੂਟੁੱਥ ਬੰਦ ਹੈ"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਬੰਦ ਹੈ"</string>
diff --git a/packages/SystemUI/res/values-pa/strings_car.xml b/packages/SystemUI/res/values-pa/strings_car.xml
index e114144..dd45851 100644
--- a/packages/SystemUI/res/values-pa/strings_car.xml
+++ b/packages/SystemUI/res/values-pa/strings_car.xml
@@ -20,8 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="car_guest" msgid="3738772168718508650">"ਮਹਿਮਾਨ"</string>
-    <!-- no translation found for start_guest_session (7055742120180595689) -->
-    <skip />
+    <string name="start_guest_session" msgid="7055742120180595689">"ਮਹਿਮਾਨ"</string>
     <string name="car_add_user" msgid="5245196248349230898">"ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="car_new_user" msgid="8142927244990323906">"ਨਵਾਂ ਵਰਤੋਂਕਾਰ"</string>
     <string name="user_add_user_message_setup" msgid="1791011504259527329">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣੀ ਜਗ੍ਹਾ ਸੈੱਟਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।"</string>
diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml
index 6e2f664..33a8117 100644
--- a/packages/SystemUI/res/values-pl/strings.xml
+++ b/packages/SystemUI/res/values-pl/strings.xml
@@ -36,8 +36,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Powiadomienia"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Bateria może się wkrótce wyczerpać"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Pozostało <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Pozostało <xliff:g id="PERCENTAGE">%s</xliff:g>, jeszcze około <xliff:g id="TIME">%s</xliff:g> (na podstawie Twojego sposobu korzystania)"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Pozostało <xliff:g id="PERCENTAGE">%s</xliff:g>, jeszcze około <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Pozostało <xliff:g id="PERCENTAGE">%1$s</xliff:g>, jeszcze około <xliff:g id="TIME">%2$s</xliff:g> (na podstawie Twojego sposobu korzystania)"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Pozostało <xliff:g id="PERCENTAGE">%1$s</xliff:g>, jeszcze około <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Pozostało <xliff:g id="PERCENTAGE">%s</xliff:g>. Oszczędzanie baterii jest włączone."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Nie można naładować przez USB. Użyj ładowarki dostarczonej z urządzeniem."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Nie można naładować przez USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Prośby o lokalizację są aktywne"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Usuń wszystkie powiadomienia."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="few">Jeszcze <xliff:g id="NUMBER_1">%s</xliff:g> powiadomienia w grupie.</item>
       <item quantity="many">Jeszcze <xliff:g id="NUMBER_1">%s</xliff:g> powiadomień w grupie.</item>
@@ -405,9 +405,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Całkowita\ncisza"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Tylko\npriorytetowe"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Tylko\nalarmy"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ładowanie (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do końca)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Szybkie ładowanie (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do końca)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Wolne ładowanie (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do końca)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ładowanie (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do końca)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Szybkie ładowanie (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do końca)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Wolne ładowanie (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do końca)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Przełącz użytkownika"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Przełącz użytkownika. Bieżący użytkownik: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Bieżący użytkownik: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -432,6 +432,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"WYLOGUJ UŻYTKOWNIKA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Dodać nowego użytkownika?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Gdy dodasz nowego użytkownika, musi on skonfigurować swój profil.\n\nKażdy użytkownik może aktualizować aplikacje wszystkich innych użytkowników."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Usunąć użytkownika?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Wszystkie aplikacje i dane tego użytkownika zostaną usunięte."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Usuń"</string>
@@ -611,7 +614,7 @@
     <string name="notification_channel_minimized" msgid="1664411570378910931">"Te powiadomienia zostaną zminimalizowane"</string>
     <string name="inline_blocking_helper" msgid="3055064577771478591">"Zwykle odrzucasz te powiadomienia. \nNadal je pokazywać?"</string>
     <string name="inline_keep_showing" msgid="8945102997083836858">"Nadal pokazywać te powiadomienia?"</string>
-    <string name="inline_stop_button" msgid="4172980096860941033">"Zatrzymaj powiadomienia"</string>
+    <string name="inline_stop_button" msgid="4172980096860941033">"Zablokuj powiadomienia"</string>
     <string name="inline_keep_button" msgid="6665940297019018232">"Pokazuj nadal"</string>
     <string name="inline_minimize_button" msgid="966233327974702195">"Minimalizuj"</string>
     <string name="inline_keep_showing_app" msgid="1723113469580031041">"Nadal pokazywać powiadomienia z tej aplikacji?"</string>
@@ -739,6 +742,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Lewa ikona"</string>
     <string name="right_icon" msgid="3952104823293824311">"Prawa ikona"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Przytrzymaj i przeciągnij, by dodać kafelki"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Przeciągnij tutaj, by usunąć"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Potrzebnych jest co najmniej sześć kafelków"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Edytuj"</string>
@@ -767,12 +772,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Dolna część ekranu na pełnym ekranie"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Położenie <xliff:g id="POSITION">%1$d</xliff:g>, kafelek <xliff:g id="TILE_NAME">%2$s</xliff:g>. Kliknij dwukrotnie, by edytować."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"Kafelek <xliff:g id="TILE_NAME">%1$s</xliff:g>. Kliknij dwukrotnie, by dodać."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Położenie <xliff:g id="POSITION">%1$d</xliff:g>. Kliknij dwukrotnie, by wybrać."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Przenieś kafelek <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Usuń kafelek <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Kafelek <xliff:g id="TILE_NAME">%1$s</xliff:g> został dodany w położeniu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Kafelek <xliff:g id="TILE_NAME">%1$s</xliff:g> został usunięty"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Kafelek <xliff:g id="TILE_NAME">%1$s</xliff:g> przeniesiony w położenie <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Dodaj kafelek <xliff:g id="TILE_NAME">%1$s</xliff:g> w położeniu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Przenieś kafelek <xliff:g id="TILE_NAME">%1$s</xliff:g> w położenie <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Edytor szybkich ustawień."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Powiadomienie z aplikacji <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Aplikacja może nie działać przy podzielonym ekranie."</string>
@@ -833,7 +836,7 @@
     <string name="app_info" msgid="6856026610594615344">"O aplikacji"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Otwórz przeglądarkę"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Komórkowa transmisja danych"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi jest wyłączone"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth jest wyłączony"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Tryb Nie przeszkadzać jest wyłączony"</string>
diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml
index a4f46a0..60825b7 100644
--- a/packages/SystemUI/res/values-pt-rBR/strings.xml
+++ b/packages/SystemUI/res/values-pt-rBR/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notificações"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"A bateria pode acabar em breve"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> restantes"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante(s), cerca de <xliff:g id="TIME">%s</xliff:g> com base no seu uso"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante(s), cerca de <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> restante(s), cerca de <xliff:g id="TIME">%2$s</xliff:g> com base no seu uso"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> restante(s), cerca de <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante(s). A Economia de bateria está ativada."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Não é possível carregar via USB. Use o carregador que acompanha o dispositivo."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Não é possível carregar via USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitações de localização ativas"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"Mais <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item>
       <item quantity="other">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Silêncio\ntotal"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Somente\nprioridade"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Somente\nalarmes"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carregando (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até a conclusão)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga rápida (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até a conclusão)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga lenta (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até a conclusão)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carregando (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> até a conclusão)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga rápida (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> até a conclusão)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga lenta (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> até a conclusão)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Trocar usuário"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Alternar usuário. Usuário atual <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Usuário atual <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"DESCONECTAR USUÁRIO"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Adicionar novo usuário?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Quando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Remover usuário?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Todos os apps e dados deste usuário serão excluídos."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Remover"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ícone à esquerda"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ícone à direita"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Mantenha pressionado e arraste para adicionar blocos"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arraste aqui para remover"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"É preciso haver pelo menos seis blocos"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Editar"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Parte inferior em tela cheia"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posição <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Toque duas vezes para editar."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Toque duas vezes para adicionar."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posição <xliff:g id="POSITION">%1$d</xliff:g>. Toque duas vezes para selecionar."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Remove <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> é adicionado à posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> é removido"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> movido para a posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Adicionar <xliff:g id="TILE_NAME">%1$s</xliff:g> à posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Mover <xliff:g id="TILE_NAME">%1$s</xliff:g> para a posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor de configurações rápidas."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notificação do <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"É possível que o app não funcione com o recurso de divisão de tela."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Informações do app"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Abrir o navegador"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Dados móveis"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"O Wi-Fi está desativado"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth desativado"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"O recurso Não perturbe está desativado"</string>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml
index 58b0315..4be7281 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notificações"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Pode ficar sem bateria em breve"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante. Cerca de <xliff:g id="TIME">%s</xliff:g> restante(s) com base na sua utilização."</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante. Cerca de <xliff:g id="TIME">%s</xliff:g> restante(s)."</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> restante. Cerca de <xliff:g id="TIME">%2$s</xliff:g> restante(s) com base na sua utilização."</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> restante. Cerca de <xliff:g id="TIME">%2$s</xliff:g> restante(s)."</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante. A Poupança de bateria está ativada."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Não é possível carregar através de USB. Utilize o carregador fornecido com o dispositivo."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Não é possível carregar através de USB."</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Pedidos de localização ativos"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item>
       <item quantity="one">Mais <xliff:g id="NUMBER_0">%s</xliff:g> notificação no grupo.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Silêncio\ntotal"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Apenas\nprioridade"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Apenas\nalarmes"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • A carregar (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até à carga máxima)…"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • A carregar rapid. (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até carga máx.)…"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • A carregar lentam. (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até carga máx.)…"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • A carregar (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> até à carga máxima)…"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • A carregar rapid. (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> até carga máx.)…"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • A carregar lentam. (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> até carga máx.)…"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Mudar utilizador"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Mudar de utilizador; o utilizador atual é <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Utilizador atual: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"TERMINAR SESSÃO DO UTILIZADOR"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Adicionar um novo utilizador?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Ao adicionar um novo utilizador, essa pessoa tem de configurar o respetivo espaço.\n\nQualquer utilizador pode atualizar aplicações para todos os outros utilizadores."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Pretende remover o utilizador?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Serão eliminados todos os dados e todas as aplicações deste utilizador."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Remover"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ícone esquerdo"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ícone direito"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Toque sem soltar e arraste para adicionar mosaicos."</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrastar para aqui para remover"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Necessita de, pelo menos, 6 mosaicos."</string>
     <string name="qs_edit" msgid="2232596095725105230">"Editar"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Ecrã inferior inteiro"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posição <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Toque duas vezes para editar."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Toque duas vezes para adicionar."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posição <xliff:g id="POSITION">%1$d</xliff:g>. Toque duas vezes para selecionar."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Mover <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Remover <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> adicionado à posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> removido"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> movido para a posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Adicionar <xliff:g id="TILE_NAME">%1$s</xliff:g> à posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Mover <xliff:g id="TILE_NAME">%1$s</xliff:g> para a posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor de definições rápidas."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notificação do <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"A aplicação pode não funcionar com o ecrã dividido."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Info. da aplicação"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Ir para o navegador"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Dados móveis"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi desativado"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth desativado"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Não incomodar desativado"</string>
diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml
index a4f46a0..60825b7 100644
--- a/packages/SystemUI/res/values-pt/strings.xml
+++ b/packages/SystemUI/res/values-pt/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notificações"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"A bateria pode acabar em breve"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> restantes"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante(s), cerca de <xliff:g id="TIME">%s</xliff:g> com base no seu uso"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante(s), cerca de <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> restante(s), cerca de <xliff:g id="TIME">%2$s</xliff:g> com base no seu uso"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> restante(s), cerca de <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> restante(s). A Economia de bateria está ativada."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Não é possível carregar via USB. Use o carregador que acompanha o dispositivo."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Não é possível carregar via USB"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitações de localização ativas"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"Mais <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item>
       <item quantity="other">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Silêncio\ntotal"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Somente\nprioridade"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Somente\nalarmes"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carregando (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até a conclusão)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga rápida (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até a conclusão)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga lenta (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até a conclusão)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carregando (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> até a conclusão)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga rápida (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> até a conclusão)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Carga lenta (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> até a conclusão)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Trocar usuário"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Alternar usuário. Usuário atual <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Usuário atual <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"DESCONECTAR USUÁRIO"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Adicionar novo usuário?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Quando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Remover usuário?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Todos os apps e dados deste usuário serão excluídos."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Remover"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ícone à esquerda"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ícone à direita"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Mantenha pressionado e arraste para adicionar blocos"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arraste aqui para remover"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"É preciso haver pelo menos seis blocos"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Editar"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Parte inferior em tela cheia"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posição <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Toque duas vezes para editar."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Toque duas vezes para adicionar."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posição <xliff:g id="POSITION">%1$d</xliff:g>. Toque duas vezes para selecionar."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Remove <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> é adicionado à posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> é removido"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> movido para a posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Adicionar <xliff:g id="TILE_NAME">%1$s</xliff:g> à posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Mover <xliff:g id="TILE_NAME">%1$s</xliff:g> para a posição <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor de configurações rápidas."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notificação do <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"É possível que o app não funcione com o recurso de divisão de tela."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Informações do app"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Abrir o navegador"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Dados móveis"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"O Wi-Fi está desativado"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth desativado"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"O recurso Não perturbe está desativado"</string>
diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml
index 34baa8a..618c890 100644
--- a/packages/SystemUI/res/values-ro/strings.xml
+++ b/packages/SystemUI/res/values-ro/strings.xml
@@ -35,8 +35,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notificări"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Este posibil ca bateria să se descarce în curând"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Procent rămas din baterie: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Procent rămas din baterie <xliff:g id="PERCENTAGE">%s</xliff:g>, în baza utilizării, timp aproximativ rămas <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Procent rămas din baterie <xliff:g id="PERCENTAGE">%s</xliff:g>, timp aproximativ rămas <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Procent rămas din baterie <xliff:g id="PERCENTAGE">%1$s</xliff:g>, în baza utilizării, timp aproximativ rămas <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Procent rămas din baterie <xliff:g id="PERCENTAGE">%1$s</xliff:g>, timp aproximativ rămas <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Procent rămas din baterie: <xliff:g id="PERCENTAGE">%s</xliff:g>. Economisirea bateriei este activată."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Nu se poate realiza încărcarea prin USB. Utilizați încărcătorul livrat împreună cu dispozitivul."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Nu se poate realiza încărcarea prin USB"</string>
@@ -260,7 +260,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitări locație active"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Ștergeți toate notificările."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="few">Încă <xliff:g id="NUMBER_1">%s</xliff:g> notificări în grup.</item>
       <item quantity="other">Încă <xliff:g id="NUMBER_1">%s</xliff:g> de notificări în grup.</item>
@@ -404,9 +404,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Niciun\nsunet"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Numai\ncu prioritate"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Numai\nalarme"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Se încarcă (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> până la finalizare)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Se încarcă rapid (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> până la finalizare)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Se încarcă lent (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> până la finalizare)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Se încarcă (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> până la finalizare)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Se încarcă rapid (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> până la finalizare)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Se încarcă lent (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> până la finalizare)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Comutați între utilizatori"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Schimbați utilizatorul (utilizator actual <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Utilizator actual <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -431,6 +431,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"DECONECTAȚI UTILIZATORUL"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Adăugați un utilizator nou?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Când adăugați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOrice utilizator poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Eliminați utilizatorul?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Toate aplicațiile și datele acestui utilizator vor fi șterse."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Eliminați"</string>
@@ -736,6 +739,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Pictograma din stânga"</string>
     <string name="right_icon" msgid="3952104823293824311">"Pictograma din dreapta"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Țineți apăsat și trageți pentru a adăuga piese"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Trageți aici pentru a elimina"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Aveți nevoie de cel puțin 6 piese"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Editați"</string>
@@ -764,12 +769,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Partea de jos pe ecran complet"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Poziția <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Atingeți de două ori pentru a edita."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Atingeți de două ori pentru a adăuga."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Poziția <xliff:g id="POSITION">%1$d</xliff:g>. Atingeți de două ori pentru a selecta."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Mutați <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Eliminați <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Caseta <xliff:g id="TILE_NAME">%1$s</xliff:g> este adăugată pe poziția <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Caseta <xliff:g id="TILE_NAME">%1$s</xliff:g> este eliminată"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Caseta <xliff:g id="TILE_NAME">%1$s</xliff:g> a fost mutată pe poziția <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Adăugați <xliff:g id="TILE_NAME">%1$s</xliff:g> pe poziția <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Mutați <xliff:g id="TILE_NAME">%1$s</xliff:g> pe poziția <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editorul pentru setări rapide."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notificare <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Este posibil ca aplicația să nu funcționeze cu ecranul împărțit."</string>
@@ -830,7 +833,7 @@
     <string name="app_info" msgid="6856026610594615344">"Informații despre aplicație"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Accesați browserul"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Date mobile"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Conexiunea Wi-Fi este dezactivată"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Funcția Bluetooth este dezactivată"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Funcția Nu deranja este dezactivată"</string>
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index 186baca..c754c36 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -36,8 +36,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Уведомления"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Батарея скоро разрядится"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Осталось: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Заряд батареи – <xliff:g id="PERCENTAGE">%s</xliff:g>, осталось примерно <xliff:g id="TIME">%s</xliff:g> при текущем уровне использования."</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Заряд батареи – <xliff:g id="PERCENTAGE">%s</xliff:g>, осталось примерно <xliff:g id="TIME">%s</xliff:g>."</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Заряд батареи – <xliff:g id="PERCENTAGE">%1$s</xliff:g>, осталось примерно <xliff:g id="TIME">%2$s</xliff:g> при текущем уровне использования."</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Заряд батареи – <xliff:g id="PERCENTAGE">%1$s</xliff:g>, осталось примерно <xliff:g id="TIME">%2$s</xliff:g>."</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Уровень заряда батареи: <xliff:g id="PERCENTAGE">%s</xliff:g>. Включен режим энергосбережения."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Невозможно выполнить зарядку через USB. Используйте зарядное устройство из комплекта."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Невозможно выполнить зарядку через USB"</string>
@@ -261,7 +261,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Есть активные запросы на определение местоположения"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Удалить все уведомления"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Ещё <xliff:g id="NUMBER_1">%s</xliff:g> уведомление.</item>
       <item quantity="few">Ещё <xliff:g id="NUMBER_1">%s</xliff:g> уведомления.</item>
@@ -407,9 +407,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Полная\nтишина"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Только\nважные"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Только\nбудильник"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"Идет зарядка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, ещё <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"Идет быстрая зарядка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, ещё <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"Идет медленная зарядка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, ещё <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"Идет зарядка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, ещё <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"Идет быстрая зарядка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, ещё <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"Идет медленная зарядка (<xliff:g id="PERCENTAGE">%2$s</xliff:g>, ещё <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Сменить пользователя."</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Сменить аккаунт. Вход выполнен под именем <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>."</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Выбран аккаунт пользователя <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -434,6 +434,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ВЫЙТИ ОТ ИМЕНИ ПОЛЬЗОВАТЕЛЯ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Добавить пользователя?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Когда вы добавите пользователя, ему потребуется настроить профиль.\n\nЛюбой пользователь устройства может обновлять приложения для всех аккаунтов."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Удалить аккаунт?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Все приложения и данные этого пользователя будут удалены."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Удалить"</string>
@@ -741,6 +744,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Значок \"Влево\""</string>
     <string name="right_icon" msgid="3952104823293824311">"Значок \"Вправо\""</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Перетащите нужные элементы"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Чтобы удалить, перетащите сюда"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Должно остаться не менее 6 элементов"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Изменить"</string>
@@ -769,12 +774,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Нижний во весь экран"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Позиция <xliff:g id="POSITION">%1$d</xliff:g>, кнопка \"<xliff:g id="TILE_NAME">%2$s</xliff:g>\". Чтобы изменить, нажмите дважды."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"Кнопка \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\". Чтобы добавить, нажмите дважды."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Позиция <xliff:g id="POSITION">%1$d</xliff:g>. Чтобы выбрать, нажмите дважды."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Переместить кнопку \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\""</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Удалить кнопку \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Кнопка \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" теперь занимает позицию <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Кнопка \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" удалена"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Кнопка \"<xliff:g id="TILE_NAME">%1$s</xliff:g>\" теперь занимает позицию <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Добавить значок <xliff:g id="TILE_NAME">%1$s</xliff:g> на позицию <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Переместить значок <xliff:g id="TILE_NAME">%1$s</xliff:g> на позицию <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Редактор быстрых настроек."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Уведомление <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Приложение не поддерживает разделение экрана."</string>
@@ -835,7 +838,7 @@
     <string name="app_info" msgid="6856026610594615344">"О приложении"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Перейти в браузер"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Моб. Интернет"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Модуль Wi-Fi отключен"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Модуль Bluetooth отключен"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Режим \"Не беспокоить\" отключен"</string>
diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml
index a34cd9d..8ec763d 100644
--- a/packages/SystemUI/res/values-si/strings.xml
+++ b/packages/SystemUI/res/values-si/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"දැනුම්දීම්"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"බැටරිය ඉක්මනින් අවසන් විය හැකිය"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> ඉතිරිව තිබේ"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> ඉතිරිව ඇත, ඔබගේ භාවිතය මත පදනම්ව <xliff:g id="TIME">%s</xliff:g> පමණ"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> ඉතිරිව ඇත, <xliff:g id="TIME">%s</xliff:g> පමණ ඇත"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ඉතිරිව ඇත, ඔබගේ භාවිතය මත පදනම්ව <xliff:g id="TIME">%2$s</xliff:g> පමණ"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ඉතිරිව ඇත, <xliff:g id="TIME">%2$s</xliff:g> පමණ ඇත"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> ඉතිරිව ඇත. බැටරි සුරැකුම ක්‍රියාත්මකයි."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB හරහා ආරෝපණය කළ නොහැකිය. ඔබේ උපාංගය සමඟ පැමිණි ආරෝපකය භාවිත කරන්න."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB හරහා ආරෝපණය කළ නොහැකිය"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"පිහිටීම් ඉල්ලීම් සක්‍රියයි"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"සියලු දැනුම්දීම් හිස් කරන්න."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">ඇතුළත තව දැනුම්දීම් <xliff:g id="NUMBER_1">%s</xliff:g>ක් ඇත.</item>
       <item quantity="other">ඇතුළත තව දැනුම්දීම් <xliff:g id="NUMBER_1">%s</xliff:g>ක් ඇත.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"සම්පූර්ණ\nනිහඬතාව"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"ප්‍රමුඛතා\nපමණි"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"ඇඟවීම්\nපමණි"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ආරෝපණය වෙමින් (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> සම්පූර්ණ වන තෙක්)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • වේගයෙන් ආරෝපණය වෙමින් (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> සම්පූර්ණ වන තෙක්)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • සෙමින් ආරෝපණය වෙමින් (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> සම්පූර්ණ වන තෙක්)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ආරෝපණය වෙමින් (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> සම්පූර්ණ වන තෙක්)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • වේගයෙන් ආරෝපණය වෙමින් (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> සම්පූර්ණ වන තෙක්)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • සෙමින් ආරෝපණය වෙමින් (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> සම්පූර්ණ වන තෙක්)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"පරිශීලක මාරුව"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"පරිශීලකයා මාරු කරන්න,දැන් සිටින පරිශීලකයා <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"වත්මන් පරිශීලක <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"පරිශීලකයා වරන්න"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"අලුත් පරිශීලකයෙක් එක් කරන්නද?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"ඔබ අලුත් පරිශීලකයෙක් එකතු කරන විට, එම පුද්ගලයා ඔහුගේ වැඩ කරන ඉඩ සකසා ගත යුතුය.\n\nසියළුම අනෙක් පරිශීලකයින් සඳහා ඕනෑම පරිශීලකයෙකුට යාවත්කාලීන කළ හැක."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"පරිශීලකයා ඉවත් කරන්නද?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"මෙම පරිශීලකයාගේ සියලු යෙදුම් සහ දත්ත මකනු ඇත."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"ඉවත් කරන්න"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"වම් නිරූපකය"</string>
     <string name="right_icon" msgid="3952104823293824311">"දකුණු නිරූපකය"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ටයිල් එක් කිරීමට අල්ලාගෙන සිට අදින්න"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ඉවත් කිරීමට මෙතැනට අදින්න"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"ඔබ අවම වශයෙන් ටයිල් 6ක් අවශ්‍ය වේ"</string>
     <string name="qs_edit" msgid="2232596095725105230">"සංස්කරණය"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"පහළ පූර්ණ තිරය"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ස්ථානය <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. වෙනස් කිරීමට දෙවරක් තට්ටු කරන්න."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. එක් කිරීමට දෙවරක් තට්ටු කරන්න."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ස්ථානය <xliff:g id="POSITION">%1$d</xliff:g>. තෝරා ගැනීමට දෙවරක් තට්ටු කරන්න."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ගෙන යන්න"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ඉවත් කරන්න"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g> වන ස්ථානයට එක් කරන ලදි"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ඉවත් කරන ලදි"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g> වන ස්ථානයට ගෙන යන ලදි"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> තත්ත්වයට <xliff:g id="POSITION">%2$d</xliff:g> එක් කරන්න"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> තත්ත්වයට <xliff:g id="POSITION">%2$d</xliff:g> ගෙන යන්න"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ඉක්මන් සැකසුම් සංස්කාරකය."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> දැනුම්දීම: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"යෙදුම බෙදුම්-තිරය සමග ක්‍රියා නොකළ හැකිය."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"යෙදුම් තොරතුරු"</string>
     <string name="go_to_web" msgid="2650669128861626071">"බ්‍රවුසරය වෙත යන්න"</string>
     <string name="mobile_data" msgid="7094582042819250762">"ජංගම දත්ත"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ක්‍රියා විරහිතයි"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"බ්ලූටූත් ක්‍රියා විරහිතයි"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"බාධා නොකරන්න ක්‍රියා විරහිතයි"</string>
diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml
index e2fa577..de32ae5 100644
--- a/packages/SystemUI/res/values-sk/strings.xml
+++ b/packages/SystemUI/res/values-sk/strings.xml
@@ -36,8 +36,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Upozornenia"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Batéria sa môže čoskoro minúť"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Zostáva <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Zostáva <xliff:g id="PERCENTAGE">%s</xliff:g>, približne <xliff:g id="TIME">%s</xliff:g> v závislosti od intenzity využitia"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Zostáva <xliff:g id="PERCENTAGE">%s</xliff:g>, približne <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Zostáva <xliff:g id="PERCENTAGE">%1$s</xliff:g>, približne <xliff:g id="TIME">%2$s</xliff:g> v závislosti od intenzity využitia"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Zostáva <xliff:g id="PERCENTAGE">%1$s</xliff:g>, približne <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Zostáva: <xliff:g id="PERCENTAGE">%s</xliff:g>. Šetrič batérie je zapnutý."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Nedá sa nabíjať cez USB. Použite nabíjačku dodanú so zariadením."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Nedá sa nabíjať cez USB"</string>
@@ -261,7 +261,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Žiadosti o polohu sú aktívne"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Vymazať všetky upozornenia."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="few">Skupina obsahuje ešte <xliff:g id="NUMBER_1">%s</xliff:g> upozornenia.</item>
       <item quantity="many">Skupina obsahuje ešte <xliff:g id="NUMBER_1">%s</xliff:g> upozornenia.</item>
@@ -407,9 +407,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Úplné\nticho"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Iba\nprioritné"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Iba\nbudíky"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nabíja sa (úplné nabitie o <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nabíja sa rýchlo (úplné nabitie o <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nabíja sa pomaly (úplné nabitie o <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nabíja sa (úplné nabitie o <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nabíja sa rýchlo (úplné nabitie o <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nabíja sa pomaly (úplné nabitie o <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Prepnutie používateľa"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Prepnúť používateľa (súčasný používateľ: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Aktuálny používateľ <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -434,6 +434,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ODHLÁSIŤ POUŽÍVATEĽA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Pridať nového používateľa?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Keď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nKtorýkoľvek používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Odstrániť používateľa?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Všetky aplikácie a údaje tohto používateľa budú odstránené."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Odstrániť"</string>
@@ -741,6 +744,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ľavá ikona"</string>
     <string name="right_icon" msgid="3952104823293824311">"Pravá ikona"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Pridržaním a presunutím pridáte dlaždice"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Presunutím sem odstránite"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Potrebujete aspoň šesť dlaždíc"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Upraviť"</string>
@@ -769,12 +774,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Dolná – na celú obrazovku"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Pozícia <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Upravíte ju dvojitým klepnutím."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Pridáte ju dvojitým klepnutím."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Pozícia <xliff:g id="POSITION">%1$d</xliff:g>. Vyberiete ju dvojitým klepnutím."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Presunúť dlaždicu <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Odstrániť dlaždicu <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Dlaždica <xliff:g id="TILE_NAME">%1$s</xliff:g> bola pridaná na pozíciu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Dlaždica <xliff:g id="TILE_NAME">%1$s</xliff:g> bola odstránená"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Dlaždica <xliff:g id="TILE_NAME">%1$s</xliff:g> bola presunutá na pozíciu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Pridať <xliff:g id="TILE_NAME">%1$s</xliff:g> na pozíciu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Presunúť <xliff:g id="TILE_NAME">%1$s</xliff:g> na pozíciu <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor rýchlych nastavení"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Upozornenie <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Aplikácia nemusí fungovať so zapnutou rozdelenou obrazovkou."</string>
@@ -835,7 +838,7 @@
     <string name="app_info" msgid="6856026610594615344">"Info o aplikácii"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Otvoriť prehliadač"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobilné dáta"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Pripojenie Wi‑Fi je vypnuté"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Rozhranie Bluetooth je vypnuté"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Nastavenie Nerušiť je vypnuté"</string>
diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml
index 3114f10..11de2d5 100644
--- a/packages/SystemUI/res/values-sl/strings.xml
+++ b/packages/SystemUI/res/values-sl/strings.xml
@@ -36,8 +36,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Obvestila"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Akumulator bo morda kmalu izpraznjen"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Še <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Še <xliff:g id="PERCENTAGE">%s</xliff:g>, glede na način uporabe imate na voljo še približno <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Še <xliff:g id="PERCENTAGE">%s</xliff:g>, na voljo imate še približno <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Še <xliff:g id="PERCENTAGE">%1$s</xliff:g>, glede na način uporabe imate na voljo še približno <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Še <xliff:g id="PERCENTAGE">%1$s</xliff:g>, na voljo imate še približno <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Še <xliff:g id="PERCENTAGE">%s</xliff:g>. Vklopljeno je varčevanje z energijo akumulatorja."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Ni mogoče polniti prek USB-ja. Uporabite polnilnik, ki je bil priložen napravi."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Ni mogoče polniti prek USB-ja"</string>
@@ -261,7 +261,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Aktivne zahteve za lokacijo"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Izbriši vsa obvestila."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"in <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Notri je še <xliff:g id="NUMBER_1">%s</xliff:g> obvestilo.</item>
       <item quantity="two">Notri sta še <xliff:g id="NUMBER_1">%s</xliff:g> obvestili.</item>
@@ -407,9 +407,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Popolna\ntišina"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Samo\nprednostno"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Samo\nalarmi"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • polnjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do napolnjenosti)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • hitro polnjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do napolnjenosti)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • počasno polnjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do napolnjenosti)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • polnjenje (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do napolnjenosti)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • hitro polnjenje (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do napolnjenosti)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • počasno polnjenje (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do napolnjenosti)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Preklop med uporabniki"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Preklop med uporabniki, trenutni uporabnik <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Trenutni uporabnik: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -434,6 +434,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ODJAVA UPORABNIKA"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Dodajanje novega uporabnika?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Ko dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Želite odstraniti uporabnika?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Vse aplikacije in podatki tega uporabnika bodo izbrisani."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Odstrani"</string>
@@ -741,6 +744,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Leva ikona"</string>
     <string name="right_icon" msgid="3952104823293824311">"Desna ikona"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Držite in povlecite, da dodate ploščice"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Če želite odstraniti, povlecite sem"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Imeti morate vsaj 6 ploščic"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Uredi"</string>
@@ -769,12 +774,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Spodnji v celozaslonski način"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Položaj <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Če želite urediti, se dvakrat dotaknite."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Če želite dodati, se dvakrat dotaknite."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Položaj: <xliff:g id="POSITION">%1$d</xliff:g>. Če želite izbrati, se dvakrat dotaknite."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Premik tega: <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Odstranitev tega: <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> je dodano na položaj <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> je odstranjeno"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> premaknjeno na položaj <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Dodaj ploščico <xliff:g id="TILE_NAME">%1$s</xliff:g> na položaj <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Premakni ploščico <xliff:g id="TILE_NAME">%1$s</xliff:g> na položaj <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Urejevalnik hitrih nastavitev."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Obvestilo za <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Aplikacija morda ne deluje v načinu razdeljenega zaslona."</string>
@@ -835,7 +838,7 @@
     <string name="app_info" msgid="6856026610594615344">"Podatki o aplikaciji"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Odpri brskalnik"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobilni podatki"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi je izklopljen"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth je izklopljen"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Način »ne moti« je izklopljen"</string>
diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml
index 7ad3fa3..ab7076c 100644
--- a/packages/SystemUI/res/values-sq/strings.xml
+++ b/packages/SystemUI/res/values-sq/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Njoftimet"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Bateria mund të mbarojë së shpejti"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Ka mbetur edhe <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> të mbetura, rreth <xliff:g id="TIME">%s</xliff:g> të mbetura bazuar në përdorimin tënd"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> të mbetura, rreth <xliff:g id="TIME">%s</xliff:g> të mbetura"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> të mbetura, rreth <xliff:g id="TIME">%2$s</xliff:g> të mbetura bazuar në përdorimin tënd"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> të mbetura, rreth <xliff:g id="TIME">%2$s</xliff:g> të mbetura"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Ka mbetur edhe <xliff:g id="PERCENTAGE">%s</xliff:g>. \"Kursyesi i baterisë\" është i aktivizuar."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Nuk mund të ngarkohet përmes USB-së. Përdor ngarkuesin që ke marrë me pajisjen."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Nuk mund të ngarkohet përmes USB-së"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Kërkesat për vendodhje janë aktive"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Pastro të gjitha njoftimet."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> njoftime të tjera në brendësi.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> njoftim tjetër në brendësi.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Heshtje\ne plotë"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Vetëm\nme prioritet"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Vetëm\nalarmet"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po ngarkohet (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> derisa të mbushet)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po ngarkohet me shpejtësi (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> derisa të mbushet)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po ngarkohet ngadalë (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> derisa të mbushet)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po ngarkohet (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> derisa të mbushet)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po ngarkohet me shpejtësi (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> derisa të mbushet)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po ngarkohet ngadalë (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> derisa të mbushet)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Ndërro përdorues"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Ndërro përdoruesin. Përdoruesi aktual është <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Përdoruesi aktual <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"NXJERRJA E PËRDORUESIT NGA IDENTIFIKIMI"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Të shtohet përdorues i ri?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Kur shton një përdorues të ri, ai person duhet të konfigurojë hapësirën e vet.\n\nÇdo përdorues mund t\'i përditësojë aplikacionet për të gjithë përdoruesit e tjerë."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Të hiqet ky përdorues?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Të gjitha aplikacionet dhe të dhënat e këtij përdoruesi do të fshihen."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Hiqe"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Ikona majtas"</string>
     <string name="right_icon" msgid="3952104823293824311">"Ikona djathtas"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Mbaje të shtypur dhe zvarrit për të shtuar pllakëza"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Zvarrit këtu për ta hequr"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Të duhen të paktën 6 pllakëza"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Redakto"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Ekrani i plotë poshtë"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Pozicioni <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Trokit dy herë për ta redaktuar."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Trokit dy herë për ta shtuar."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Pozicioni <xliff:g id="POSITION">%1$d</xliff:g>. Trokit dy herë për ta zgjedhur."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Zhvendose <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Hiqe <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> është shtuar te pozicioni <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> u hoq"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> u zhvendos te pozicioni <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Shto <xliff:g id="TILE_NAME">%1$s</xliff:g> te pozicioni <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Zhvendos <xliff:g id="TILE_NAME">%1$s</xliff:g> te pozicioni <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Redaktori i cilësimeve të shpejta."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Njoftim nga <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Aplikacioni mund të mos funksionojë me ekranin e ndarë."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Informacioni mbi aplikacionin"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Shko te shfletuesi"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Të dhënat celulare"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi është joaktiv"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth-i është joaktiv"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Modaliteti \"Mos shqetëso\" është joaktiv"</string>
diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml
index 2ecac35..2dbdc3d 100644
--- a/packages/SystemUI/res/values-sr/strings.xml
+++ b/packages/SystemUI/res/values-sr/strings.xml
@@ -35,8 +35,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Обавештења"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Батерија ће се можда ускоро испразнити"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Још <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Још <xliff:g id="PERCENTAGE">%s</xliff:g>, на основу коришћења остало је око <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Још <xliff:g id="PERCENTAGE">%s</xliff:g>, остало је око <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Још <xliff:g id="PERCENTAGE">%1$s</xliff:g>, на основу коришћења остало је око <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Још <xliff:g id="PERCENTAGE">%1$s</xliff:g>, остало је око <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Још <xliff:g id="PERCENTAGE">%s</xliff:g>. Уштеда батерије је укључена."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Пуњење преко USB-а није успело. Користите пуњач који сте добили уз уређај."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Пуњење преко USB-а није успело"</string>
@@ -258,7 +258,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Има активних захтева за локацију"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Обриши сва обавештења."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"и још <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, још <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, још <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Још <xliff:g id="NUMBER_1">%s</xliff:g> обавештење у групи.</item>
       <item quantity="few">Још <xliff:g id="NUMBER_1">%s</xliff:g> обавештења у групи.</item>
@@ -402,9 +402,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Потпуна\nтишина"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Само\nприорит. прекиди"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Само\nаларми"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Пуни се (напуниће се за <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Брзо се пуни (напуниће се за <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Споро се пуни (напуниће се за <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Пуни се (напуниће се за <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Брзо се пуни (напуниће се за <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Споро се пуни (напуниће се за <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Замени корисника"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Промените корисника, актуелни корисник је <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Актуелни корисник <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -429,6 +429,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ОДЈАВИ КОРИСНИКА"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Додајете новог корисника?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Када додате новог корисника, та особа треба да подеси свој простор.\n\nСваки корисник може да ажурира апликације за све остале кориснике."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Желите ли да уклоните корисника?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Све апликације и подаци овог корисника ће бити избрисани."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Уклони"</string>
@@ -734,6 +737,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Лева икона"</string>
     <string name="right_icon" msgid="3952104823293824311">"Десна икона"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Задржите и превуците да бисте додали плочице"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Превуците овде да бисте уклонили"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Треба да изаберете најмање 6 плочица"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Измени"</string>
@@ -762,12 +767,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Режим целог екрана за доњи екран"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g>. позиција, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Двапут додирните да бисте изменили."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Двапут додирните да бисте додали."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g>. позиција. Двапут додирните да бисте изабрали."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Премести плочицу <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Уклони плочицу <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Плочица <xliff:g id="TILE_NAME">%1$s</xliff:g> је додата на <xliff:g id="POSITION">%2$d</xliff:g>. позицију"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Плочица <xliff:g id="TILE_NAME">%1$s</xliff:g> је уклоњена"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Плочица <xliff:g id="TILE_NAME">%1$s</xliff:g> је премештена на <xliff:g id="POSITION">%2$d</xliff:g>. позицију"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Додајте „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ на позицију <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Преместите „<xliff:g id="TILE_NAME">%1$s</xliff:g>“ на позицију <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Уређивач за Брза подешавања."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Обавештења за <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Апликација можда неће функционисати са подељеним екраном."</string>
@@ -828,7 +831,7 @@
     <string name="app_info" msgid="6856026610594615344">"Информације о апликацији"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Иди на прегледач"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Мобилни подаци"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi је искључен"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth је искључен"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Режим Не узнемиравај је искључен"</string>
diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml
index 0deb4b4..4b05e27 100644
--- a/packages/SystemUI/res/values-sv/strings.xml
+++ b/packages/SystemUI/res/values-sv/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Aviseringar"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Batteriet kan ta slut snart"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> kvar"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> återstår, cirka <xliff:g id="TIME">%s</xliff:g> kvar utifrån din användning"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> återstår, cirka <xliff:g id="TIME">%s</xliff:g> kvar"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> återstår, cirka <xliff:g id="TIME">%2$s</xliff:g> kvar utifrån din användning"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> återstår, cirka <xliff:g id="TIME">%2$s</xliff:g> kvar"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> kvar. Batterisparläget är aktiverat."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Det går inte att ladda via USB. Använd laddaren som följde med enheten."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Det går inte att ladda via USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Det finns aktiva platsbegäranden"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Ta bort alla meddelanden."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> till"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> fler aviseringar i gruppen.</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> till avisering i gruppen.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Helt\ntyst"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Endast\nprioriterade"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Endast\nalarm"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laddas (fulladdat om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laddas snabbt (fulladdat om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laddas långsamt (fulladdat om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laddas (fulladdat om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laddas snabbt (fulladdat om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Laddas långsamt (fulladdat om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Byt användare"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Byt användare. Aktuell användare: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Aktuell användare <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"LOGGA UT ANVÄNDAREN"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Lägga till ny användare?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"När du lägger till en ny användare måste den personen konfigurera sitt utrymme.\n\nAlla användare kan uppdatera appar för samtliga användares räkning."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Vill du ta bort användaren?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Alla appar och all data som tillhör den här användaren raderas."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Ta bort"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Vänster ikon"</string>
     <string name="right_icon" msgid="3952104823293824311">"Höger ikon"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Lägg till rutor genom att trycka och dra"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Ta bort genom att dra här"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Minst sex rutor måste finnas kvar"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Redigera"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Helskärm på nedre skärm"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Tryck snabbt två gånger för att redigera positionen."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Lägg till genom att trycka snabbt två gånger."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Position <xliff:g id="POSITION">%1$d</xliff:g>. Välj den genom att trycka snabbt två gånger."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Flytta <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Ta bort <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> har lagts till på position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> har tagits bort"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> har flyttats till position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Lägg till <xliff:g id="TILE_NAME">%1$s</xliff:g> på position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Flytta <xliff:g id="TILE_NAME">%1$s</xliff:g> till position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Redigerare för snabbinställningar."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g>-avisering: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Appen kanske inte fungerar med delad skärm."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Info om appen"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Öppna webbläsaren"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobildata"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi är inaktiverat"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth är inaktiverat"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Stör ej är inaktiverat"</string>
diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml
index ef90f3e..7cb38b2 100644
--- a/packages/SystemUI/res/values-sw/strings.xml
+++ b/packages/SystemUI/res/values-sw/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Arifa"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Huenda chaji itaisha hivi karibuni"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Imebakisha <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Imesalia <xliff:g id="PERCENTAGE">%s</xliff:g>, itadumu takribani <xliff:g id="TIME">%s</xliff:g> kulingana na jinsi unavyotumia"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Imesalia <xliff:g id="PERCENTAGE">%s</xliff:g>, itadumu takribani <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Imesalia <xliff:g id="PERCENTAGE">%1$s</xliff:g>, itadumu takribani <xliff:g id="TIME">%2$s</xliff:g> kulingana na jinsi unavyotumia"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Imesalia <xliff:g id="PERCENTAGE">%1$s</xliff:g>, itadumu takribani <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Imesalia <xliff:g id="PERCENTAGE">%s</xliff:g>. Umewasha Kiokoa Betri."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Haiwezi kuchaji kupitia USB. Tumia chaja ambayo ilikuja na kifaa chako."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Haiwezi kuchaji kupitia USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Maombi ya eneo yanatumika"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Futa arifa zote."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Kuna arifa <xliff:g id="NUMBER_1">%s</xliff:g> zaidi katika kikundi.</item>
       <item quantity="one">Kuna arifa <xliff:g id="NUMBER_0">%s</xliff:g> zaidi katika kikundi.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Kimya\nkabisa"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Kipaumbele\npekee"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Kengele\npekee"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Inachaji (Imebakisha <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ili ijae)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Inachaji kwa kasi (Imebakisha <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ili ijae)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Inachaji pole pole (Imebakisha <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ili ijae)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Inachaji (Imebakisha <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ili ijae)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Inachaji kwa kasi (Imebakisha <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ili ijae)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Inachaji pole pole (Imebakisha <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ili ijae)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Badili mtumiaji"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Badili mtumiaji, mtumiaji wa sasa <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Mtumiaji wa sasa <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ONDOA MTUMIAJI"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Ungependa kuongeza mtumiaji?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Mtumiaji mpya utakayemwongeza atahitaji kuongeza akaunti yake.\n\nMtumiaji yoyote anaweza kusasisha programu kwa niaba ya wengine wote."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Je, ungependa kuondoa mtumiaji?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Programu na data yote ya mtumiaji huyu itafutwa."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Ondoa"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Aikoni ya kushoto"</string>
     <string name="right_icon" msgid="3952104823293824311">"Aikoni ya kulia"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Shikilia na uburute ili uongeze vigae"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Buruta hapa ili uondoe"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Unahitaji angalau vigae 6"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Badilisha"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Skrini nzima ya chini"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Nafasi ya <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Gusa mara mbili ili ubadilishe."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Gusa mara mbili ili uongeze."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Nafasi ya <xliff:g id="POSITION">%1$d</xliff:g>. Gusa mara mbili ili uchague."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Hamisha <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Ondoa <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> imeongezwa kwenye nafasi ya <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> imeondolewa"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> imehamishiwa kwenye nafasi ya <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Ongeza <xliff:g id="TILE_NAME">%1$s</xliff:g> kwenye nafasi ya <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Sogeza <xliff:g id="TILE_NAME">%1$s</xliff:g> kwenye nafasi ya <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Kihariri cha Mipangilio ya haraka."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Arifa kutoka <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Huenda programu isifanye kazi kwenye skrini inayogawanywa."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Maelezo ya programu"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Tumia kivinjari"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Data ya simu"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g><xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g><xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi imezimwa"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth imezimwa"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Kipengele cha Usinisumbue kimezimwa"</string>
diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml
index b1eeb41..84041a9 100644
--- a/packages/SystemUI/res/values-ta/strings.xml
+++ b/packages/SystemUI/res/values-ta/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"அறிவிப்புகள்"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"பேட்டரி விரைவில் தீர்ந்துவிடக்கூடும்"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> உள்ளது"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> பேட்டரி மீதமுள்ளது. உங்கள் உபயோகத்தைப் பொறுத்து, இதைச் சுமார் <xliff:g id="TIME">%s</xliff:g> மணி நேரத்திற்குப் பயன்படுத்தலாம்"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> மீதமுள்ளது, இதைச் சுமார் <xliff:g id="TIME">%s</xliff:g> மணி நேரத்திற்குப் பயன்படுத்தலாம்"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> பேட்டரி மீதமுள்ளது. உங்கள் உபயோகத்தைப் பொறுத்து, இதைச் சுமார் <xliff:g id="TIME">%2$s</xliff:g> மணி நேரத்திற்குப் பயன்படுத்தலாம்"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> மீதமுள்ளது, இதைச் சுமார் <xliff:g id="TIME">%2$s</xliff:g> மணி நேரத்திற்குப் பயன்படுத்தலாம்"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> மீதமுள்ளது. பேட்டரி சேமிப்பான் ஆன் செய்யப்பட்டுள்ளது."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB மூலம், சார்ஜ் செய்ய முடியாது. உங்கள் சாதனத்துடன் வழங்கப்பட்ட சார்ஜரைப் பயன்படுத்தவும்."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB மூலம், சார்ஜ் செய்ய முடியாது"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"இருப்பிடக் கோரிக்கைகள் இயக்கப்பட்டன"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"எல்லா அறிவிப்புகளையும் அழி."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">உள்ளே மேலும் <xliff:g id="NUMBER_1">%s</xliff:g> அறிவிப்புகள் உள்ளன.</item>
       <item quantity="one">உள்ளே மேலும் <xliff:g id="NUMBER_0">%s</xliff:g> அறிவிப்பு உள்ளது.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"அறிவிப்புகள்\nவேண்டாம்"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"முன்னுரிமைகள்\nமட்டும்"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"அலாரங்கள்\nமட்டும்"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • சார்ஜாகிறது (முழு சார்ஜ்: <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • வேகமாகச் சார்ஜாகிறது (முழு சார்ஜ்: <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • மெதுவாகச் சார்ஜாகிறது (முழு சார்ஜ்: <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • சார்ஜாகிறது (முழு சார்ஜ்: <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • வேகமாகச் சார்ஜாகிறது (முழு சார்ஜ்: <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • மெதுவாகச் சார்ஜாகிறது (முழு சார்ஜ்: <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"பயனரை மாற்று"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"பயனரை மாற்று, தற்போதைய பயனர் <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"தற்போதைய பயனர்: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"பயனரை வெளியேற்று"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"புதியவரைச் சேர்க்கவா?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"புதிய பயனரைச் சேர்க்கும்போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஎந்தவொரு பயனரும், மற்ற எல்லா பயனர்களுக்காகவும் பயன்பாடுகளைப் புதுப்பிக்கலாம்."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"பயனரை அகற்றவா?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"இந்தப் பயனரின் எல்லா பயன்பாடுகளும் தரவும் நீக்கப்படும்."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"அகற்று"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"இடப்புற ஐகான்"</string>
     <string name="right_icon" msgid="3952104823293824311">"வலப்புற ஐகான்"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"கட்டங்களைச் சேர்க்க, அவற்றைப் பிடித்து இழுக்கவும்"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"அகற்ற, இங்கே இழுக்கவும்"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"குறைந்தது 6 கட்டங்கள் தேவை"</string>
     <string name="qs_edit" msgid="2232596095725105230">"மாற்று"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"கீழ்ப்புறம் முழுத் திரை"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"நிலை <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. திருத்த, இருமுறை தட்டவும்."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. சேர்க்க, இருமுறை தட்டவும்."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"நிலை <xliff:g id="POSITION">%1$d</xliff:g>. தேர்ந்தெடுக்க, இருமுறை தட்டவும்."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ஐ நகர்த்தவும்"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ஐ அகற்றவும்"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> நிலை <xliff:g id="POSITION">%2$d</xliff:g> இல் சேர்க்கப்பட்டது"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> அகற்றப்பட்டது"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> நிலை <xliff:g id="POSITION">%2$d</xliff:g>க்கு நகர்த்தப்பட்டது"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"நிலைப்பாடு <xliff:g id="POSITION">%2$d</xliff:g> இல் <xliff:g id="TILE_NAME">%1$s</xliff:g>ஐச் சேர்க்கும்"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"நிலைப்பாடு <xliff:g id="POSITION">%2$d</xliff:g>க்கு <xliff:g id="TILE_NAME">%1$s</xliff:g>ஐ நகர்த்தும்"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"விரைவு அமைப்புகள் திருத்தி."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> அறிவிப்பு: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"திரைப் பிரிப்பில் பயன்பாடு வேலைசெய்யாமல் போகக்கூடும்."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"பயன்பாட்டுத் தகவல்"</string>
     <string name="go_to_web" msgid="2650669128861626071">"உலாவிக்குச் செல்"</string>
     <string name="mobile_data" msgid="7094582042819250762">"மொபைல் டேட்டா"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"வைஃபை முடக்கத்தில் உள்ளது"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"புளூடூத் முடக்கத்தில் உள்ளது"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\"தொந்தரவு செய்ய வேண்டாம்\" முடக்கத்தில் உள்ளது"</string>
diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml
index 20a146e..fc48ac1 100644
--- a/packages/SystemUI/res/values-te/strings.xml
+++ b/packages/SystemUI/res/values-te/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"నోటిఫికేషన్‌లు"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"బ్యాటరీ త్వరలో ఖాళీ అవ్వచ్చు"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> మిగిలి ఉంది"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> మిగిలి ఉంది, మీ ఉపయోగం ఆధారంగా దాదాపు <xliff:g id="TIME">%s</xliff:g> ఉండవచ్చు"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> మిగిలి ఉంది, దాదాపు <xliff:g id="TIME">%s</xliff:g> ఉండవచ్చు"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> మిగిలి ఉంది, మీ ఉపయోగం ఆధారంగా దాదాపు <xliff:g id="TIME">%2$s</xliff:g> ఉండవచ్చు"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> మిగిలి ఉంది, దాదాపు <xliff:g id="TIME">%2$s</xliff:g> ఉండవచ్చు"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> మిగిలి ఉంది. బ్యాటరీ సేవర్ ఆన్‌లో ఉంది."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB ద్వారా ఛార్జ్ చేయలేరు. మీ పరికరంతో వచ్చిన ఛార్జర్‌ను ఉపయోగించండి."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB ద్వారా ఛార్జ్ చేయలేరు"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"స్థాన అభ్యర్థనలు సక్రియంగా ఉన్నాయి"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"అన్ని నోటిఫికేషన్‌లను క్లియర్ చేయండి."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">లోపల మరో <xliff:g id="NUMBER_1">%s</xliff:g> నోటిఫికేషన్‌లు ఉన్నాయి.</item>
       <item quantity="one">లోపల మరో <xliff:g id="NUMBER_0">%s</xliff:g> నోటిఫికేషన్ ఉంది.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"మొత్తం\nనిశ్శబ్దం"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"ప్రాధాన్యమైనవి\nమాత్రమే"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"అలారాలు\nమాత్రమే"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ఛార్జ్ అవుతోంది (పూర్తి కావడానికి <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • వేగంగా ఛార్జ్ అవుతోంది (పూర్తి కావడానికి <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • నెమ్మదిగా ఛార్జ్ అవుతోంది (పూర్తి కావడానికి <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ఛార్జ్ అవుతోంది (పూర్తి కావడానికి <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • వేగంగా ఛార్జ్ అవుతోంది (పూర్తి కావడానికి <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • నెమ్మదిగా ఛార్జ్ అవుతోంది (పూర్తి కావడానికి <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"వినియోగదారుని మార్చు"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"వినియోగదారుని మార్చు, ప్రస్తుత వినియోగదారు <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"ప్రస్తుత వినియోగదారు <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"వినియోగదారుని లాగ్ అవుట్ చేయి"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"కొత్త వినియోగదారుని జోడించాలా?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"మీరు కొత్త వినియోగదారుని జోడించినప్పుడు, ఆ వ్యక్తి తన స్థలాన్ని సెటప్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగతా అందరు వినియోగదారుల కోసం అనువర్తనాలను నవీకరించగలరు."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"వినియోగదారుని తీసివేయాలా?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"ఈ వినియోగదారుకు సంబంధించిన అన్ని అనువర్తనాలు మరియు డేటా తొలగించబడతాయి."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"తీసివేయి"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"ఎడమ వైపు చిహ్నం"</string>
     <string name="right_icon" msgid="3952104823293824311">"కుడివైపు ఉన్న చిహ్నం"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"టైల్‌లను జోడించడం కోసం పట్టుకుని, లాగండి"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"తీసివేయడానికి ఇక్కడికి లాగండి"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"మీ వద్ద కనీసం 6 టైల్‌లు ఉండాలి"</string>
     <string name="qs_edit" msgid="2232596095725105230">"సవరించు"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"దిగువ పూర్తి స్క్రీన్"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"స్థానం <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. సవరించడానికి రెండుసార్లు నొక్కండి."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. జోడించడానికి రెండుసార్లు నొక్కండి."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"స్థానం <xliff:g id="POSITION">%1$d</xliff:g>. ఎంచుకోవడానికి రెండుసార్లు నొక్కండి."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ని తరలిస్తుంది"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g>ని తీసివేస్తుంది"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g>వ స్థానానికి జోడించబడింది"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> తీసివేయబడింది"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g>వ స్థానానికి తరలించబడింది"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"స్థానం <xliff:g id="POSITION">%2$d</xliff:g>కి <xliff:g id="TILE_NAME">%1$s</xliff:g>ని జోడించండి"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"స్థానం <xliff:g id="POSITION">%2$d</xliff:g>కి <xliff:g id="TILE_NAME">%1$s</xliff:g>ని తరలించండి"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"శీఘ్ర సెట్టింగ్‌ల ఎడిటర్."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> నోటిఫికేషన్: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"స్క్రీన్ విభజనతో యాప్‌ పని చేయకపోవచ్చు."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"యాప్ సమాచారం"</string>
     <string name="go_to_web" msgid="2650669128861626071">"బ్రౌజర్‌కు వెళ్లండి"</string>
     <string name="mobile_data" msgid="7094582042819250762">"మొబైల్ డేటా"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ఆఫ్‌లో ఉంది"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"బ్లూటూత్ ఆఫ్‌లో ఉంది"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"అంతరాయం కలిగించవద్దు ఆఫ్‌లో ఉంది"</string>
diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml
index 4616996..bf61986 100644
--- a/packages/SystemUI/res/values-th/strings.xml
+++ b/packages/SystemUI/res/values-th/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"การแจ้งเตือน"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"แบตเตอรี่อาจหมดเร็วๆ นี้"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"เหลืออีก <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"เหลือ <xliff:g id="PERCENTAGE">%s</xliff:g> หรืออีกราว <xliff:g id="TIME">%s</xliff:g> ขึ้นอยู่กับการใช้งานของคุณ"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"เหลือ <xliff:g id="PERCENTAGE">%s</xliff:g> หรืออีกราว <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"เหลือ <xliff:g id="PERCENTAGE">%1$s</xliff:g> หรืออีกราว <xliff:g id="TIME">%2$s</xliff:g> ขึ้นอยู่กับการใช้งานของคุณ"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"เหลือ <xliff:g id="PERCENTAGE">%1$s</xliff:g> หรืออีกราว <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"แบตเตอรี่เหลือ <xliff:g id="PERCENTAGE">%s</xliff:g> เปิดโหมดประหยัดแบตเตอรี่อยู่"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"ชาร์จผ่าน USB ไม่ได้ โปรดใช้ที่ชาร์จที่ให้มาพร้อมกับอุปกรณ์"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"ชาร์จผ่าน USB ไม่ได้"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"คำขอตำแหน่งที่มีการใช้งาน"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"ล้างการแจ้งเตือนทั้งหมด"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">มีการแจ้งเตือนอีก <xliff:g id="NUMBER_1">%s</xliff:g> รายการด้านใน</item>
       <item quantity="one">มีการแจ้งเตือนอีก <xliff:g id="NUMBER_0">%s</xliff:g> รายการด้านใน</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"ปิดเสียง\nทั้งหมด"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"เฉพาะเรื่อง\nสำคัญ"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"เฉพาะปลุก\nเท่านั้น"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • กำลังชาร์จ (อีก <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> จะเต็ม)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • กำลังชาร์จอย่างเร็ว (อีก <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> จะเต็ม)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • กำลังชาร์จอย่างช้าๆ (อีก <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> จะเต็ม)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • กำลังชาร์จ (อีก <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> จะเต็ม)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • กำลังชาร์จอย่างเร็ว (อีก <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> จะเต็ม)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • กำลังชาร์จอย่างช้าๆ (อีก <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> จะเต็ม)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"สลับผู้ใช้"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"เปลี่ยนผู้ใช้จากผู้ใช้ปัจจุบัน <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"ผู้ใช้ปัจจุบัน <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ออกจากระบบผู้ใช้"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"ต้องการเพิ่มผู้ใช้ใหม่ใช่ไหม"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"เมื่อคุณเพิ่มผู้ใช้ใหม่ ผู้ใช้ดังกล่าวจะต้องตั้งค่าพื้นที่ของตนเอง\n\nผู้ใช้ทุกคนสามารถอัปเดตแอปสำหรับผู้ใช้รายอื่นทุกคนได้"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"นำผู้ใช้ออกใช่ไหม"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"แอปและข้อมูลทั้งหมดของผู้ใช้นี้จะถูกลบ"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"นำออก"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"ไอคอนทางซ้าย"</string>
     <string name="right_icon" msgid="3952104823293824311">"ไอคอนทางขวา"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"กดชิ้นส่วนค้างไว้แล้วลากไปเพื่อเพิ่ม"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ลากมาที่นี่เพื่อนำออก"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"คุณต้องมีชิ้นส่วนอย่างน้อย 6 ชิ้น"</string>
     <string name="qs_edit" msgid="2232596095725105230">"แก้ไข"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"เต็มหน้าจอด้านล่าง"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ตำแหน่ง <xliff:g id="POSITION">%1$d</xliff:g> <xliff:g id="TILE_NAME">%2$s</xliff:g> แตะ 2 ครั้งเพื่อแก้ไข"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g> แตะ 2 ครั้งเพื่อเพิ่ม"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ตำแหน่ง <xliff:g id="POSITION">%1$d</xliff:g> แตะ 2 ครั้งเพื่อเลือก"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"ย้าย <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"นำ <xliff:g id="TILE_NAME">%1$s</xliff:g> ออก"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"เพิ่ม <xliff:g id="TILE_NAME">%1$s</xliff:g> ลงในตำแหน่ง <xliff:g id="POSITION">%2$d</xliff:g> แล้ว"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"นำ <xliff:g id="TILE_NAME">%1$s</xliff:g> ออกแล้ว"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"ย้าย <xliff:g id="TILE_NAME">%1$s</xliff:g> ไปยังตำแหน่ง <xliff:g id="POSITION">%2$d</xliff:g> แล้ว"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"เพิ่ม <xliff:g id="TILE_NAME">%1$s</xliff:g> ไปยังตำแหน่ง <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"ย้าย <xliff:g id="TILE_NAME">%1$s</xliff:g> ไปยังตำแหน่ง <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ตัวแก้ไขการตั้งค่าด่วน"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> การแจ้งเตือน: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"แอปอาจใช้ไม่ได้กับโหมดแยกหน้าจอ"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ข้อมูลแอป"</string>
     <string name="go_to_web" msgid="2650669128861626071">"ไปที่เบราว์เซอร์"</string>
     <string name="mobile_data" msgid="7094582042819250762">"เน็ตมือถือ"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ปิดอยู่"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"บลูทูธปิดอยู่"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\"ห้ามรบกวน\" ปิดอยู่"</string>
diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml
index 0c1b8a5..fef7632 100644
--- a/packages/SystemUI/res/values-tl/strings.xml
+++ b/packages/SystemUI/res/values-tl/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Mga Notification"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Malapit nang maubos ang baterya"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> na lang ang natitira"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> na lang ang natitira, humigit-kumulang <xliff:g id="TIME">%s</xliff:g> ang natitira batay sa iyong paggamit"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> na lang ang natitira, humigit-kumulang <xliff:g id="TIME">%s</xliff:g> ang natitira"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> na lang ang natitira, humigit-kumulang <xliff:g id="TIME">%2$s</xliff:g> ang natitira batay sa iyong paggamit"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> na lang ang natitira, humigit-kumulang <xliff:g id="TIME">%2$s</xliff:g> ang natitira"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> na lang ang natitira. Naka-on ang Pangtipid sa Baterya."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Hindi makapag-charge sa pamamagitan ng USB. Gamitin ang charger na kasama ng iyong device."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Hindi makapag-charge sa pamamagitan ng USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Aktibo ang mga kahilingan ng lokasyon"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"I-clear ang lahat ng notification."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">May <xliff:g id="NUMBER_1">%s</xliff:g> pang notification sa loob.</item>
       <item quantity="other">May <xliff:g id="NUMBER_1">%s</xliff:g> pang notification sa loob.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Ganap na\nkatahimikan"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Priyoridad\nlang"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Mga alarm\nlang"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nagcha-charge (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hanggang mapuno)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mabilis na nagcha-charge (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> na lang)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mabagal na nagcha-charge (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> na lang)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Nagcha-charge (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> hanggang mapuno)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mabilis na nagcha-charge (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> na lang)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mabagal na nagcha-charge (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> na lang)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Magpalit ng user"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Magpalit ng user, kasalukuyang user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Kasalukuyang user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"I-LOGOUT ANG USER"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Magdagdag ng bagong user?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Kapag nagdagdag ka ng bagong user, kailangang i-set up ng taong iyon ang kanyang espasyo.\n\nAng sinumang user ay maaaring mag-update ng mga app para sa lahat ng iba pang user."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Gusto mo bang alisin ang user?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Made-delete ang lahat ng app at data ng user na ito."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Alisin"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Icon ng kaliwa"</string>
     <string name="right_icon" msgid="3952104823293824311">"Icon ng kanan"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Pindutin nang matagal at i-drag para magdagdag ng mga tile"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"I-drag dito upang alisin"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Kailangan mo ng hindi bababa sa 6 na tile"</string>
     <string name="qs_edit" msgid="2232596095725105230">"I-edit"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"I-full screen ang nasa ibaba"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Posisyon <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. I-double tap upang i-edit."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. I-double tap upang idagdag."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Posisyon <xliff:g id="POSITION">%1$d</xliff:g>. I-double tap upang piliin."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Ilipat ang <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Alisin ang <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"Idinagdag ang <xliff:g id="TILE_NAME">%1$s</xliff:g> sa posisyon <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"Inalis ang <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"Inilipat ang <xliff:g id="TILE_NAME">%1$s</xliff:g> sa posisyon <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Idagdag ang <xliff:g id="TILE_NAME">%1$s</xliff:g> sa posisyong <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Ilipat ang <xliff:g id="TILE_NAME">%1$s</xliff:g> sa posisyong <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Editor ng Mga mabilisang setting."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Notification sa <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Maaaring hindi gumana ang app sa split-screen."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Impormasyon ng app"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Pumunta sa browser"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobile data"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Naka-off ang Wi-Fi"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Naka-off ang Bluetooth"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Naka-off ang Huwag Istorbohin"</string>
diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml
index 7abf64f..fd8ab73 100644
--- a/packages/SystemUI/res/values-tr/strings.xml
+++ b/packages/SystemUI/res/values-tr/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Bildirimler"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Pil kısa süre sonra bitebilir"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> kaldı"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> kaldı (kullanımınıza göre yaklaşık <xliff:g id="TIME">%s</xliff:g>)"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> (yaklaşık <xliff:g id="TIME">%s</xliff:g>) kaldı"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> kaldı (kullanımınıza göre yaklaşık <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> (yaklaşık <xliff:g id="TIME">%2$s</xliff:g>) kaldı"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> kaldı. Pil Tasarrufu açık."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB üzerinden şarj edilemiyor. Cihazınızla birlikte gelen şarj cihazını kullanın."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB ile şarj edilemiyor"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Konum bilgisi istekleri etkin"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Tüm bildirimleri temizle"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Grup içinde <xliff:g id="NUMBER_1">%s</xliff:g> bildirim daha var.</item>
       <item quantity="one">Grup içinde <xliff:g id="NUMBER_0">%s</xliff:g> bildirim daha var.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Tamamen\nsessiz"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Yalnızca\nöncelik"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Yalnızca\nalarmlar"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Şarj oluyor (dolmasına <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> kaldı)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Hızlı şarj oluyor (dolmasına <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> kaldı)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Yavaş şarj oluyor (dolmasına <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> kaldı)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Şarj oluyor (dolmasına <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> kaldı)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Hızlı şarj oluyor (dolmasına <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> kaldı)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Yavaş şarj oluyor (dolmasına <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> kaldı)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Kullanıcı değiştirme"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Kullanıcı değiştir. Geçerli kullanıcı: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Geçerli kullanıcı: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"KULLANICI OTURUMUNU KAPAT"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Yeni kullanıcı eklensin mi?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Yeni bir kullanıcı eklediğinizde, bu kişinin kendi alanını ayarlaması gerekir.\n\nHerhangi bir kullanıcı, diğer tüm kullanıcılar için uygulamaları güncelleyebilir."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Kullanıcı kaldırılsın mı?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Bu kullanıcının tüm uygulamaları ve verileri silinecek."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Kaldır"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Sol simge"</string>
     <string name="right_icon" msgid="3952104823293824311">"Sağ simge"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Blok eklemek için basılı tutup sürükleyin"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Kaldırmak için buraya sürükleyin"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"En az 6 blok gerekiyor"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Düzenle"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Altta tam ekran"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g>. konum, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Düzenlemek için iki kez dokunun."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Eklemek için iki kez dokunun."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"<xliff:g id="POSITION">%1$d</xliff:g>. konum. Seçmek için iki kez dokunun."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> kutusunu taşı"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> kutusunu kaldır"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> kutusu <xliff:g id="POSITION">%2$d</xliff:g>. konuma eklendi"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> kaldırıldı"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> <xliff:g id="POSITION">%2$d</xliff:g>. konumuna taşındı"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="TILE_NAME">%1$s</xliff:g> öğesini <xliff:g id="POSITION">%2$d</xliff:g> konumuna ekle"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> öğesini <xliff:g id="POSITION">%2$d</xliff:g> konumuna taşı"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Hızlı ayar düzenleyicisi."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> bildirimi: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Uygulama bölünmüş ekranda çalışmayabilir."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Uygulama bilgileri"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Tarayıcıya git"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobil veriler"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Kablosuz bağlantı kapalı"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth kapalı"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Rahatsız Etmeyin kapalı"</string>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index f9f5ce8..7d61d37 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -36,8 +36,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Сповіщення"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Акумулятор може невдовзі розрядитися"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Залишилося <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"На основі використання залишилося <xliff:g id="PERCENTAGE">%s</xliff:g> – близько <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Залишилося <xliff:g id="PERCENTAGE">%s</xliff:g> – близько <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"На основі використання залишилося <xliff:g id="PERCENTAGE">%1$s</xliff:g> – близько <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Залишилося <xliff:g id="PERCENTAGE">%1$s</xliff:g> – близько <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Залишилося <xliff:g id="PERCENTAGE">%s</xliff:g>. Увімкнено режим економії заряду акумулятора."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Не вдається зарядити через USB. Використовуйте зарядний пристрій, який входить у комплект пристрою."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Не вдається зарядити через USB"</string>
@@ -261,7 +261,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Запити про місцезнаходження активні"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Очистити всі сповіщення."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, + <xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, + <xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one">Ще <xliff:g id="NUMBER_1">%s</xliff:g> сповіщення в групі.</item>
       <item quantity="few">Ще <xliff:g id="NUMBER_1">%s</xliff:g> сповіщення в групі.</item>
@@ -407,9 +407,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Без\nсигналів"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Лише\nприорітетні"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Лише\nсигнали"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Заряджання (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до повного)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Швидке заряджання (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до повного)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Повільне заряджання (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до повного)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Заряджання (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> до повного)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Швидке заряджання (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> до повного)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Повільне заряджання (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> до повного)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Змінити користувача"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Змінити користувача, поточний користувач – <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Поточний користувач: <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -434,6 +434,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ВИЙТИ З ОБЛІКОВОГО ЗАПИСУ"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Додати нового користувача?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Користувач має налаштувати свій профіль після створення.\n\nБудь-який користувач пристрою може оновлювати додатки для решти користувачів."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Видалити користувача?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Усі додатки й дані цього користувача буде видалено."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Видалити"</string>
@@ -741,6 +744,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Значок ліворуч"</string>
     <string name="right_icon" msgid="3952104823293824311">"Значок праворуч"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Натисніть і перетягніть, щоб додати фрагменти"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Перетягніть сюди, щоб видалити"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Потрібно принаймні 6 фрагментів"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Редагувати"</string>
@@ -769,12 +774,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Нижнє вікно на весь екран"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Позиція <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Двічі торкніться, щоб змінити."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Двічі торкніться, щоб додати."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Позиція <xliff:g id="POSITION">%1$d</xliff:g>. Двічі торкніться, щоб вибрати."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Перемістити <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Видалити <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> додано на позицію <xliff:g id="POSITION">%2$d</xliff:g>."</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> видалено"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> переміщено на позицію <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Додати <xliff:g id="TILE_NAME">%1$s</xliff:g> на позицію <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Перемістити <xliff:g id="TILE_NAME">%1$s</xliff:g> на позицію <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Редактор швидких налаштувань."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Сповіщення <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Додаток може не працювати в режимі розділеного екрана."</string>
@@ -835,7 +838,7 @@
     <string name="app_info" msgid="6856026610594615344">"Про додаток"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Веб-переглядач"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Мобільний трафік"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi вимкнено"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth вимкнено"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Режим \"Не турбувати\" вимкнено"</string>
diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml
index 0566022..dbdc034 100644
--- a/packages/SystemUI/res/values-ur/strings.xml
+++ b/packages/SystemUI/res/values-ur/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"اطلاعات"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"بیٹری جلد ہی ختم ہو سکتی ہے"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی ہے"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی، آپ کے استعمال کی بنیاد پر تقریباً <xliff:g id="TIME">%s</xliff:g> باقی ہے"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی، تقریباً <xliff:g id="TIME">%s</xliff:g> باقی ہے"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> باقی، آپ کے استعمال کی بنیاد پر تقریباً <xliff:g id="TIME">%2$s</xliff:g> باقی ہے"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> باقی، تقریباً <xliff:g id="TIME">%2$s</xliff:g> باقی ہے"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> باقی ہے۔ بیٹری سیور آن ہے۔"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"‏USB کے ذریعے چارج نہیں کر سکتے۔ اپنے آلہ کے ساتھ ملنے والے چارجر کا استعمال کریں۔"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"‏USB کے ذریعے چارج نہیں کر سکتے"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"مقام کی درخواستیں فعال ہیں"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"سبھی اطلاعات صاف کریں۔"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> +"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>، +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>، +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">اندر <xliff:g id="NUMBER_1">%s</xliff:g> مزید اطلاعات ہیں۔ </item>
       <item quantity="one">اندر <xliff:g id="NUMBER_0">%s</xliff:g> مزید اطلاع ہے۔</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"مکمل\nخاموشی"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"صرف\nترجیحی"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"صرف\nالارمز"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • چارج ہو رہا ہے (مکمل ہونے میں <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> باقی)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • تیزی سے چارج ہو رہا ہے (مکمل ہونے میں <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> باقی)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • آہستہ چارج ہو رہا ہے (مکمل ہونے میں <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> باقی)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • چارج ہو رہا ہے (مکمل ہونے میں <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> باقی)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • تیزی سے چارج ہو رہا ہے (مکمل ہونے میں <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> باقی)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • آہستہ چارج ہو رہا ہے (مکمل ہونے میں <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> باقی)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"صارف سوئچ کریں"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"صارف سوئچ کریں، موجودہ صارف <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"موجودہ صارف <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"صارف لاگ آؤٹ کریں"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"نیا صارف شامل کریں؟"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"جب آپ ایک نیا صارف شامل کرتے ہیں تو اس شخص کو اپنی جگہ کو ترتیب دینے کی ضرورت ہوتی ہے۔\n\nکوئی بھی صارف دیگر سبھی صارفین کیلئے ایپس کو اپ ڈیٹ کر سکتا ہے۔"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"صارف کو ہٹائیں؟"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"اس صارف کی سبھی ایپس اور ڈیٹا حذف کر دیا جائے گا۔"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"ہٹائیں"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"بائیں جانب کا آئیکن"</string>
     <string name="right_icon" msgid="3952104823293824311">"دائيں جانب کا آئيکن"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"ٹائلز شامل کرنے کے لئے پکڑ کر گھسیٹیں"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ہٹانے کیلئے یہاں گھسیٹیں؟"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"آپ کو کم از کم 6 ٹائلز کی ضرورت ہے"</string>
     <string name="qs_edit" msgid="2232596095725105230">"ترمیم کریں"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"نچلی فل اسکرین"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"پوزیشن <xliff:g id="POSITION">%1$d</xliff:g>، <xliff:g id="TILE_NAME">%2$s</xliff:g>۔ ترمیم کرنے کیلئے دو بار تھپتھپائیں۔"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>۔ شامل کرنے کیلئے دو بار تھپتھپائیں۔"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"پوزیشن <xliff:g id="POSITION">%1$d</xliff:g>۔ منتخب کرنے کیلئے دو بار تھپتھپائیں۔"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> کو منتقل کریں"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ہٹائیں"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="POSITION">%2$d</xliff:g> پوزیشن پر <xliff:g id="TILE_NAME">%1$s</xliff:g> شامل ہو گیا ہے"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ہٹا دیا گیا"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="POSITION">%2$d</xliff:g> پوزیشن پر <xliff:g id="TILE_NAME">%1$s</xliff:g> منتقل ہو گیا ہے"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"پوزیشن <xliff:g id="TILE_NAME">%1$s</xliff:g> میں <xliff:g id="POSITION">%2$d</xliff:g> شامل کریں"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="TILE_NAME">%1$s</xliff:g> کو پوزیشن <xliff:g id="POSITION">%2$d</xliff:g> میں منتقل کریں"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"فوری ترتیبات کا ایڈیٹر۔"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> اطلاع: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"ممکن ہے کہ ایپ سپلٹ اسکرین کے ساتھ کام نہ کرے۔"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"ایپ کی معلومات"</string>
     <string name="go_to_web" msgid="2650669128861626071">"براؤزر پر جائیں"</string>
     <string name="mobile_data" msgid="7094582042819250762">"موبائل ڈیٹا"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"‏Wi-Fi آف ہے"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"بلوٹوتھ آف ہے"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"\'ڈسٹرب نہ کریں\' آف ہے"</string>
diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml
index 5ce50a3..f4403e7 100644
--- a/packages/SystemUI/res/values-uz/strings.xml
+++ b/packages/SystemUI/res/values-uz/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Eslatmalar"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Batareya tez orada tugaydi"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> qoldi"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> (joriy holatda taxminan <xliff:g id="TIME">%s</xliff:g> qoldi)"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> (taxminan <xliff:g id="TIME">%s</xliff:g> qoldi)"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> (joriy holatda taxminan <xliff:g id="TIME">%2$s</xliff:g> qoldi)"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> (taxminan <xliff:g id="TIME">%2$s</xliff:g> qoldi)"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> qoldi. Quvvat tejash rejimi yoniq."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"USB orqali quvvatlash imkonsiz. Qurilmangiz bilan kelgan quvvatlash moslamasidan foydalaning."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"USB orqali quvvatlash imkonsiz"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Joylashuv so‘rovlari yoniq"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Barcha eslatmalarni tozalash."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Guruhda yana <xliff:g id="NUMBER_1">%s</xliff:g> ta bildirishnoma.</item>
       <item quantity="one">Guruhda yana <xliff:g id="NUMBER_0">%s</xliff:g> ta bildirishnoma.</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Tinchlik\nsaqlansin"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Faqat\nmuhimlar"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Faqat\nsignallar"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Quvvat olmoqda (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> qoldi)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Tez quvvat olmoqda (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> qoldi)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Sekin quvvat olmoqda (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> qoldi)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Quvvat olmoqda (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> qoldi)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Tez quvvat olmoqda (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> qoldi)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Sekin quvvat olmoqda (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> qoldi)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Foydalanuvchini almashtirish"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Foydalanuvchini o‘zgartirish. Joriy foydalanuvchi – <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Joriy foydalanuvchi <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"FOYDALANUVCHI NOMIDAN CHIQISH"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Foydalanuvchi qo‘shilsinmi?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Yangi profil qo‘shilgach, uni sozlash lozim.\n\nQurilmaning istalgan foydalanuvchisi ilovalarni barcha hisoblar uchun yangilashi mumkin."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Foydalanuvchi olib tashlansinmi?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Ushbu foydalanuvchining barcha ilovalari va ma’lumotlari o‘chirib tashlanadi."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Olib tashlash"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Chapga belgisi"</string>
     <string name="right_icon" msgid="3952104823293824311">"O‘ngga belgisi"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Keraklisini ushlab torting"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"O‘chirish uchun bu yerga torting"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Kamida 6 ta katakcha lozim"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Tahrirlash"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Pastda to‘liq ekran"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"<xliff:g id="POSITION">%1$d</xliff:g>-joy, “<xliff:g id="TILE_NAME">%2$s</xliff:g>” tugmasi. Tahrirlash uchun ustiga ikki marta bosing."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"“<xliff:g id="TILE_NAME">%1$s</xliff:g>” tugmasi. Qo‘shish uchun ustiga ikki marta bosing."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Joylashuv: <xliff:g id="POSITION">%1$d</xliff:g>. Belgilash uchun ustiga ikki marta bosing."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"“<xliff:g id="TILE_NAME">%1$s</xliff:g>” tugmasini ko‘chirish"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"“<xliff:g id="TILE_NAME">%1$s</xliff:g>” tugmasini o‘chirish"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"“<xliff:g id="TILE_NAME">%1$s</xliff:g>” tugmasi endi <xliff:g id="POSITION">%2$d</xliff:g>-joyni egallamoqda"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"“<xliff:g id="TILE_NAME">%1$s</xliff:g>” tugmasi o‘chirildi"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"“<xliff:g id="TILE_NAME">%1$s</xliff:g>” tugmasi endi <xliff:g id="POSITION">%2$d</xliff:g>-joyni egallanmoqda"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"<xliff:g id="POSITION">%2$d</xliff:g>-joyga buni qo‘shish: <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"<xliff:g id="POSITION">%2$d</xliff:g>-joyga buni ko‘chirish: <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Tezkor sozlamalar muharriri"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> bildirishnomasi: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Ilova ekranni ikkiga bo‘lish rejimini qo‘llab-quvvatlamaydi."</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"Ilova haqida"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Brauzerni ochish"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Mobil internet"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi o‘chiq"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth o‘chiq"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Bezovta qilinmasin rejimi o‘chiq"</string>
diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml
index 3f0091f..d8fd0eb 100644
--- a/packages/SystemUI/res/values-vi/strings.xml
+++ b/packages/SystemUI/res/values-vi/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Thông báo"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Có thể sắp hết pin"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"Còn lại <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Còn lại <xliff:g id="PERCENTAGE">%s</xliff:g>, còn khoảng <xliff:g id="TIME">%s</xliff:g> dựa trên mức sử dụng của bạn"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Còn lại <xliff:g id="PERCENTAGE">%s</xliff:g>, còn khoảng <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"Còn lại <xliff:g id="PERCENTAGE">%1$s</xliff:g>, còn khoảng <xliff:g id="TIME">%2$s</xliff:g> dựa trên mức sử dụng của bạn"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"Còn lại <xliff:g id="PERCENTAGE">%1$s</xliff:g>, còn khoảng <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"Còn lại <xliff:g id="PERCENTAGE">%s</xliff:g>. Trình tiết kiệm pin đang bật."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Không thể sạc qua USB. Hãy sử dụng bộ sạc đi kèm với thiết bị."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Không thể sạc qua USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Yêu cầu về thông tin vị trí đang hoạt động"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Xóa tất cả thông báo."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">Còn <xliff:g id="NUMBER_1">%s</xliff:g> thông báo nữa bên trong.</item>
       <item quantity="one">Còn <xliff:g id="NUMBER_0">%s</xliff:g> thông báo nữa bên trong.</item>
@@ -329,7 +329,7 @@
     <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Đang dùng làm điểm truy cập Internet"</string>
     <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Điểm phát sóng"</string>
     <string name="quick_settings_hotspot_secondary_label_transient" msgid="8010579363691405477">"Đang bật…"</string>
-    <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="5672131949987422420">"Trình tiết kiệm dữ liệu bật"</string>
+    <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="5672131949987422420">"Trình tiết kiệm dữ liệu đang bật"</string>
     <plurals name="quick_settings_hotspot_secondary_label_num_devices" formatted="false" msgid="2324635800672199428">
       <item quantity="other">%d thiết bị</item>
       <item quantity="one">%d thiết bị</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Hoàn toàn\ntắt tiếng"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Chỉ\nưu tiên"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Chỉ\nbáo thức"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Đang sạc (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> cho tới khi đầy)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Đang sạc nhanh (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> cho tới khi đầy)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Đang sạc chậm (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> cho tới khi đầy)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Đang sạc (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> cho tới khi đầy)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Đang sạc nhanh (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> cho tới khi đầy)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Đang sạc chậm (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> cho tới khi đầy)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Chuyển đổi người dùng"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Chuyển người dùng, người dùng hiện tại <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Người dùng hiện tại <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"ĐĂNG XUẤT NGƯỜI DÙNG"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Thêm người dùng mới?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Khi bạn thêm người dùng mới, người dùng đó cần thiết lập dung lượng lưu trữ của mình.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Xóa người dùng?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Tất cả các ứng dụng và dữ liệu của người dùng này sẽ bị xóa."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Xóa"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Biểu tượng bên trái"</string>
     <string name="right_icon" msgid="3952104823293824311">"Biểu tượng bên phải"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Giữ và kéo để thêm ô"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Kéo vào đây để xóa"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Bạn cần ít nhất 6 ô"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Chỉnh sửa"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Toàn màn hình phía dưới"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Vị trí <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Nhấn đúp để chỉnh sửa."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Nhấn đúp để thêm."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Vị trí <xliff:g id="POSITION">%1$d</xliff:g>. Nhấn đúp để chọn."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Di chuyển <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Xóa <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> được thêm vào vị trí <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> được di chuyển"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> được di chuyển sang vị trí <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Thêm <xliff:g id="TILE_NAME">%1$s</xliff:g> vào vị trí <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Di chuyển <xliff:g id="TILE_NAME">%1$s</xliff:g> đến vị trí <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Trình chỉnh sửa cài đặt nhanh."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"Thông báo của <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Ứng dụng có thể không hoạt động với tính năng chia đôi màn hình."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Thông tin ứng dụng"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Đi tới trình duyệt"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Dữ liệu di động"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi tắt"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth tắt"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Không làm phiền tắt"</string>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index 12675b0..c7443fe 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"通知"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"电池电量可能很快就要耗尽"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"剩余<xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"剩余电量:<xliff:g id="PERCENTAGE">%s</xliff:g>;根据您的使用情况,大约还可使用 <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"剩余电量:<xliff:g id="PERCENTAGE">%s</xliff:g>;大约还可使用 <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"剩余电量:<xliff:g id="PERCENTAGE">%1$s</xliff:g>;根据您的使用情况,大约还可使用 <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"剩余电量:<xliff:g id="PERCENTAGE">%1$s</xliff:g>;大约还可使用 <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"剩余 <xliff:g id="PERCENTAGE">%s</xliff:g>。省电模式已开启。"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"无法通过 USB 充电。请使用设备随附的充电器。"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"无法通过 USB 充电"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"应用发出了有效位置信息请求"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> (+<xliff:g id="OVERFLOW">%s</xliff:g>)"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (+<xliff:g id="OVERFLOW">%2$s</xliff:g>)"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">此群组内还有 <xliff:g id="NUMBER_1">%s</xliff:g> 条通知。</item>
       <item quantity="one">此群组内还有 <xliff:g id="NUMBER_0">%s</xliff:g> 条通知。</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"完全\n静音"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"仅限\n优先打扰"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"仅限\n闹钟"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在充电(还需 <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>充满)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在快速充电(还需 <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>充满)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在慢速充电(还需 <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>充满)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在充电(还需 <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>充满)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在快速充电(还需 <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>充满)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在慢速充电(还需 <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>充满)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"切换用户"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"切换用户,当前用户为<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"当前用户为<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"退出当前用户"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"要添加新用户吗?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"当您添加新用户时,该用户必须设置自己的空间。\n\n任何用户均可为其他所有用户更新应用。"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"是否移除用户?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"此用户的所有应用和数据均将被删除。"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"移除"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"向左图标"</string>
     <string name="right_icon" msgid="3952104823293824311">"向右图标"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"按住并拖动即可添加图块"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"拖动到此处即可移除"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"您至少需要 6 个图块"</string>
     <string name="qs_edit" msgid="2232596095725105230">"编辑"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"底部全屏"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"位置 <xliff:g id="POSITION">%1$d</xliff:g>,<xliff:g id="TILE_NAME">%2$s</xliff:g>。点按两次即可修改。"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>。点按两次即可添加。"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"位置 <xliff:g id="POSITION">%1$d</xliff:g>。点按两次即可选择。"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"移动<xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"移除<xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"已将<xliff:g id="TILE_NAME">%1$s</xliff:g>添加到位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"已移除<xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"已将<xliff:g id="TILE_NAME">%1$s</xliff:g>移至位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"将“<xliff:g id="TILE_NAME">%1$s</xliff:g>”添加到位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"将“<xliff:g id="TILE_NAME">%1$s</xliff:g>”移动到位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"快捷设置编辑器。"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g>通知:<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"应用可能无法在分屏模式下正常运行。"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"应用信息"</string>
     <string name="go_to_web" msgid="2650669128861626071">"转到浏览器"</string>
     <string name="mobile_data" msgid="7094582042819250762">"移动数据"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"WLAN 已关闭"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"蓝牙已关闭"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"“勿扰”模式已关闭"</string>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml
index 8f9b33f..dace26a 100644
--- a/packages/SystemUI/res/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"通知"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"電池電量可能即將耗盡"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"剩餘 <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"電量剩餘 <xliff:g id="PERCENTAGE">%s</xliff:g>,根據您的使用情況,剩餘時間大約 <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"電量剩餘 <xliff:g id="PERCENTAGE">%s</xliff:g>,剩餘時間大約 <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"電量剩餘 <xliff:g id="PERCENTAGE">%1$s</xliff:g>,根據您的使用情況,剩餘時間大約 <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"電量剩餘 <xliff:g id="PERCENTAGE">%1$s</xliff:g>,剩餘時間大約 <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"剩餘 <xliff:g id="PERCENTAGE">%s</xliff:g>。省電模式已開啟。"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"無法透過 USB 充電,請使用裝置隨附的充電器。"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"無法透過 USB 充電"</string>
@@ -259,7 +259,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"位置要求啟動中"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> (+<xliff:g id="OVERFLOW">%s</xliff:g> 個)"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (+<xliff:g id="OVERFLOW">%2$s</xliff:g> 個)"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">裡面還有 <xliff:g id="NUMBER_1">%s</xliff:g> 個通知。</item>
       <item quantity="one">裡面還有 <xliff:g id="NUMBER_0">%s</xliff:g> 個通知。</item>
@@ -401,9 +401,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"完全\n靜音"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"僅限\n優先"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"僅限\n鬧鐘"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在充電 (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>後完成充電)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在快速充電 (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>後完成充電)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在慢速充電 (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>後完成)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在充電 (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>後完成充電)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在快速充電 (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>後完成充電)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 正在慢速充電 (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>後完成)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"切換使用者"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"切換使用者,目前使用者是<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"目前的使用者是 <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -428,6 +428,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"登出使用者"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"新增使用者?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"新增的使用者需要自行設定個人空間。\n\n任何使用者均可為所有其他使用者更新應用程式。"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"移除使用者?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"系統將會刪除這個使用者的所有應用程式和資料。"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"移除"</string>
@@ -731,6 +734,8 @@
     <string name="left_icon" msgid="3096287125959387541">"向左圖示"</string>
     <string name="right_icon" msgid="3952104823293824311">"向右圖示"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"按住並拖曳即可新增圖塊"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"拖曳這裡即可移除"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"您必須至少有 6 個圖塊"</string>
     <string name="qs_edit" msgid="2232596095725105230">"編輯"</string>
@@ -759,12 +764,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"底部全螢幕"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"位置 <xliff:g id="POSITION">%1$d</xliff:g>,<xliff:g id="TILE_NAME">%2$s</xliff:g>。輕按兩下即可編輯。"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>。輕按兩下即可新增。"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"位置 <xliff:g id="POSITION">%1$d</xliff:g>。輕按兩下即可選取。"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"移動 <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"移除 <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 已新增至位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 已移除"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="TILE_NAME">%1$s</xliff:g> 已移至位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"將「<xliff:g id="TILE_NAME">%1$s</xliff:g>」加去位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"將「<xliff:g id="TILE_NAME">%1$s</xliff:g>」移去位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"快速設定編輯工具。"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> 通知:<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"應用程式可能無法在分割畫面中運作。"</string>
@@ -825,7 +828,7 @@
     <string name="app_info" msgid="6856026610594615344">"應用程式資料"</string>
     <string name="go_to_web" msgid="2650669128861626071">"前往瀏覽器"</string>
     <string name="mobile_data" msgid="7094582042819250762">"流動數據"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi 已關閉"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"藍牙已關閉"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"「請勿騷擾」已關閉"</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml
index 2672138..c1be1fb 100644
--- a/packages/SystemUI/res/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"通知"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"電池電力可能很快就會耗盡"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"僅剩 <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"電力剩餘 <xliff:g id="PERCENTAGE">%s</xliff:g>,根據你的使用情形,剩餘時間大約還有 <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"電力剩餘 <xliff:g id="PERCENTAGE">%s</xliff:g>,剩餘時間大約還有 <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"電力剩餘 <xliff:g id="PERCENTAGE">%1$s</xliff:g>,根據你的使用情形,剩餘時間大約還有 <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"電力剩餘 <xliff:g id="PERCENTAGE">%1$s</xliff:g>,剩餘時間大約還有 <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"僅剩 <xliff:g id="PERCENTAGE">%s</xliff:g>。節約耗電量模式已開啟。"</string>
     <string name="invalid_charger" msgid="2741987096648693172">"無法透過 USB 充電,請使用裝置隨附的充電器。"</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"無法透過 USB 充電"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"有位置資訊要求"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g> (+<xliff:g id="OVERFLOW">%s</xliff:g>)"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (+<xliff:g id="OVERFLOW">%2$s</xliff:g>)"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="other">群組中還有 <xliff:g id="NUMBER_1">%s</xliff:g> 則通知。</item>
       <item quantity="one">群組中還有 <xliff:g id="NUMBER_0">%s</xliff:g> 則通知。</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"完全\n靜音"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"僅允許\n優先通知"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"僅允許\n鬧鐘"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 充電中 (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>後充飽)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 快速充電中 (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>後充飽)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 慢速充電中 (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>後充飽)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 充電中 (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>後充飽)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 快速充電中 (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>後充飽)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • 慢速充電中 (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>後充飽)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"切換使用者"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"切換使用者,目前使用者是<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"目前使用者是「<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>」"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"登出使用者"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"新增使用者?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"新增的使用者需要自行設定個人空間。\n\n任何使用者皆可為其他所有使用者更新應用程式。"</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"要移除使用者嗎?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"系統將刪除這個使用者的所有應用程式和資料。"</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"移除"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"向左圖示"</string>
     <string name="right_icon" msgid="3952104823293824311">"向右圖示"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"按住並拖曳即可新增圖塊"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"拖曳到這裡即可移除"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"你至少必須要有 6 個圖塊"</string>
     <string name="qs_edit" msgid="2232596095725105230">"編輯"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"以全螢幕顯示底部畫面"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"位置 <xliff:g id="POSITION">%1$d</xliff:g>,<xliff:g id="TILE_NAME">%2$s</xliff:g>。輕觸兩下即可編輯。"</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>。輕觸兩下即可新增。"</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"位置 <xliff:g id="POSITION">%1$d</xliff:g>。輕觸兩下即可選取。"</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"移動 <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"移除 <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"已將 <xliff:g id="TILE_NAME">%1$s</xliff:g> 新增到位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"已移除 <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"已將 <xliff:g id="TILE_NAME">%1$s</xliff:g> 移到位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"將 <xliff:g id="TILE_NAME">%1$s</xliff:g> 新增到位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"將 <xliff:g id="TILE_NAME">%1$s</xliff:g> 移到位置 <xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"快速設定編輯器。"</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> 通知:<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"應用程式可能無法在分割畫面中運作。"</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"應用程式資訊"</string>
     <string name="go_to_web" msgid="2650669128861626071">"前往瀏覽器"</string>
     <string name="mobile_data" msgid="7094582042819250762">"行動數據"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi 已關閉"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"藍牙已關閉"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"零打擾模式已關閉"</string>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index 099cbfe..5be16e3 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -34,8 +34,8 @@
     <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Izaziso"</string>
     <string name="battery_low_title" msgid="9187898087363540349">"Ibhethri lingaphela maduze"</string>
     <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> okusele"</string>
-    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%s</xliff:g> okusele, cishe u-<xliff:g id="TIME">%s</xliff:g> osele ngokusukela ekusebenziseni kwakho"</string>
-    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%s</xliff:g> okusele, cishe u-<xliff:g id="TIME">%s</xliff:g> osele"</string>
+    <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> okusele, cishe u-<xliff:g id="TIME">%2$s</xliff:g> osele ngokusukela ekusebenziseni kwakho"</string>
+    <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> okusele, cishe u-<xliff:g id="TIME">%2$s</xliff:g> osele"</string>
     <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> esele. Isilondolozi sebhethri sivuliwe."</string>
     <string name="invalid_charger" msgid="2741987096648693172">"Ayikwazi ukushaja nge-USB. Sebenzisa ishaja eze nedivayisi yakho."</string>
     <string name="invalid_charger_title" msgid="2836102177577255404">"Ayikwazi ukushaja nge-USB"</string>
@@ -257,7 +257,7 @@
     <string name="accessibility_location_active" msgid="2427290146138169014">"Izicelo zendawo ziyasebenza"</string>
     <string name="accessibility_clear_all" msgid="5235938559247164925">"Susa zonke izaziso."</string>
     <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%s</xliff:g>, +<xliff:g id="OVERFLOW">%s</xliff:g>"</string>
+    <string name="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
     <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
       <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> izaziso eziningi ngaphakathi.</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> izaziso eziningi ngaphakathi.</item>
@@ -399,9 +399,9 @@
     <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Ukuthula\niokuphelele"</string>
     <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Okubalulekile\nkuphela"</string>
     <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Ama-alamu\nkuphela"</string>
-    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Iyashaja (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ize igcwale)"</string>
-    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ishaja kaningi (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ize igcwale)"</string>
-    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ishaja kancane (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ize igcwale)"</string>
+    <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Iyashaja (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ize igcwale)"</string>
+    <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • ishaja kaningi (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ize igcwale)"</string>
+    <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ishaja kancane (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> ize igcwale)"</string>
     <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Shintsha umsebenzisi"</string>
     <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Shintsha umsebenzisi, umsebenzisi wamanje ngu-<xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
     <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Umsebenzisi wamanje <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
@@ -426,6 +426,9 @@
     <string name="user_logout_notification_action" msgid="1195428991423425062">"KHIPHA UMSEBENZISI"</string>
     <string name="user_add_user_title" msgid="4553596395824132638">"Engeza umsebenzisi omusha?"</string>
     <string name="user_add_user_message_short" msgid="2161624834066214559">"Uma ungeza umsebenzisi omusha, loyo muntu udinga ukusetha isikhala sakhe.\n\nNoma yimuphi umsebenzisi angabuyekeza izinhlelo zokusebenza kubo bonke abasebenzisi."</string>
+    <!-- no translation found for user_limit_reached_title (7374910700117359177) -->
+    <skip />
+    <!-- no translation found for user_limit_reached_message (1855040563671964242) -->
     <string name="user_remove_user_title" msgid="4681256956076895559">"Susa umsebenzisi?"</string>
     <string name="user_remove_user_message" msgid="1453218013959498039">"Zonke izinhlelo zokusebenza nedatha yalo msebenzisi kuzosuswa."</string>
     <string name="user_remove_user_remove" msgid="7479275741742178297">"Susa"</string>
@@ -729,6 +732,8 @@
     <string name="left_icon" msgid="3096287125959387541">"Isithonjana esingakwesokunxele"</string>
     <string name="right_icon" msgid="3952104823293824311">"Isithonjana sangakwesokudla"</string>
     <string name="drag_to_add_tiles" msgid="230586591689084925">"Bamba uphinde uhudule ukuze ungeze amathayela"</string>
+    <!-- no translation found for drag_to_rearrange_tiles (4566074720193667473) -->
+    <skip />
     <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Hudulela lapha ukuze ususe"</string>
     <string name="drag_to_remove_disabled" msgid="2390968976638993382">"Udinga okungenani amathayela angu-6"</string>
     <string name="qs_edit" msgid="2232596095725105230">"Hlela"</string>
@@ -757,12 +762,10 @@
     <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Ngaphansi kwesikrini esigcwele"</string>
     <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Isimo esingu-<xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Thepha kabili ukuze uhlele."</string>
     <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Thepha kabili ukuze ungeze."</string>
-    <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"Isimo esingu-<xliff:g id="POSITION">%1$d</xliff:g>. Thepha kabili ukuze ukhethe."</string>
     <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Hambisa i-<xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Susa i-<xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"I-<xliff:g id="TILE_NAME">%1$s</xliff:g> ingezwe kusimo esingu-<xliff:g id="POSITION">%2$d</xliff:g>"</string>
-    <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"I-<xliff:g id="TILE_NAME">%1$s</xliff:g> isusiwe"</string>
-    <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"I-<xliff:g id="TILE_NAME">%1$s</xliff:g> ihanjiswe kusimo esingu-<xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Engeza i-<xliff:g id="TILE_NAME">%1$s</xliff:g> ukuze ubeke i-<xliff:g id="POSITION">%2$d</xliff:g>"</string>
+    <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Hambisa i-<xliff:g id="TILE_NAME">%1$s</xliff:g> ukuze ubeke i-<xliff:g id="POSITION">%2$d</xliff:g>"</string>
     <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Isihleli sezilungiselelo ezisheshayo."</string>
     <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> isaziso: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="dock_forced_resizable" msgid="5914261505436217520">"Izinhlelo zokusebenza kungenzeka zingasebenzi ngesikrini esihlukanisiwe."</string>
@@ -823,7 +826,7 @@
     <string name="app_info" msgid="6856026610594615344">"Ulwazi lohlelo lokusebenza"</string>
     <string name="go_to_web" msgid="2650669128861626071">"Iya kusiphequluli"</string>
     <string name="mobile_data" msgid="7094582042819250762">"Idatha yeselula"</string>
-    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="wifi_is_off" msgid="1838559392210456893">"I-Wi-Fi ivaliwe"</string>
     <string name="bt_is_off" msgid="2640685272289706392">"I-Bluetooth ivaliwe"</string>
     <string name="dnd_is_off" msgid="6167780215212497572">"Ungaphazamisi kuvaliwe"</string>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 7e35f5f..d051f07 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -352,6 +352,9 @@
     <dimen name="qs_tile_margin_horizontal">18dp</dimen>
     <dimen name="qs_tile_margin_vertical">24dp</dimen>
     <dimen name="qs_tile_margin_top_bottom">12dp</dimen>
+    <dimen name="qs_tile_margin_top_bottom_negative">-12dp</dimen>
+    <!-- The height of the qs customize header. Should be (28dp - qs_tile_margin_top_bottom). -->
+    <dimen name="qs_customize_header_min_height">40dp</dimen>
     <dimen name="qs_tile_margin_top">18dp</dimen>
     <dimen name="qs_quick_tile_size">48dp</dimen>
     <!-- Maximum width of quick quick settings panel. Defaults to MATCH_PARENT-->
diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp
index eb71698..710b5f7 100644
--- a/packages/SystemUI/shared/Android.bp
+++ b/packages/SystemUI/shared/Android.bp
@@ -24,20 +24,3 @@
     // no compatibility issues with launcher
     java_version: "1.7",
 }
-
-android_app {
-
-    name: "SysUISharedLib",
-    platform_apis: true,
-    srcs: [
-        "src/**/*.java",
-        "src/**/I*.aidl",
-    ],
-
-    static_libs: ["SystemUISharedLib"],
-
-    optimize: {
-        enabled: false,
-    },
-
-}
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl
index 1c46f12..ece2bb9 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl
@@ -17,6 +17,7 @@
 package com.android.systemui.shared.recents;
 
 import android.graphics.Rect;
+import android.view.MotionEvent;
 
 /**
  * Temporary callbacks into SystemUI.
@@ -60,4 +61,14 @@
      * needed from current value
      */
     void setBackButtonAlpha(float alpha, boolean animate) = 8;
+
+    /**
+     * Proxies motion events from the homescreen UI to the status bar. Only called when
+     * swipe down is detected on WORKSPACE. The sender guarantees the following order of events on
+     * the tracking pointer.
+     *
+     * Normal gesture: DOWN, MOVE/POINTER_DOWN/POINTER_UP)*, UP or CANCLE
+     */
+    void onStatusBarMotionEvent(in MotionEvent event) = 9;
+
 }
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java
index 67afee0..70258c2 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java
@@ -83,11 +83,6 @@
         return this;
     }
 
-    public TransactionCompat setFinalCrop(SurfaceControlCompat surfaceControl, Rect crop) {
-        mTransaction.setFinalCrop(surfaceControl.mSurfaceControl, crop);
-        return this;
-    }
-
     public TransactionCompat deferTransactionUntil(SurfaceControlCompat surfaceControl,
             IBinder handle, long frameNumber) {
         mTransaction.deferTransactionUntil(surfaceControl.mSurfaceControl, handle, frameNumber);
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 3e534d1..ff6a1c9 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -1597,7 +1597,7 @@
     public boolean isUnlockWithFacePossible(int userId) {
         return mFaceAuthenticationManager != null && mFaceAuthenticationManager.isHardwareDetected()
                 && !isFaceDisabled(userId)
-                && mFaceAuthenticationManager.hasEnrolledFaces(userId);
+                && mFaceAuthenticationManager.hasEnrolledTemplates(userId);
     }
 
     private void stopListeningForFingerprint() {
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index 2dd54aa..b2cf305 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -133,6 +133,10 @@
      */
     public static final DependencyKey<Looper> BG_LOOPER = new DependencyKey<>("background_looper");
     /**
+     * Key for getting a background Handler for background work.
+     */
+    public static final DependencyKey<Handler> BG_HANDLER = new DependencyKey<>("background_handler");
+    /**
      * Key for getting a Handler for receiving time tick broadcasts on.
      */
     public static final DependencyKey<Handler> TIME_TICK_HANDLER =
@@ -166,6 +170,7 @@
             thread.start();
             return thread.getLooper();
         });
+        mProviders.put(BG_HANDLER, () -> new Handler(getDependency(BG_LOOPER)));
         mProviders.put(MAIN_HANDLER, () -> new Handler(Looper.getMainLooper()));
         mProviders.put(ActivityStarter.class, () -> new ActivityStarterDelegate());
         mProviders.put(ActivityStarterDelegate.class, () ->
@@ -288,7 +293,7 @@
                 new PluginDependencyProvider(get(PluginManager.class)));
 
         mProviders.put(LocalBluetoothManager.class, () ->
-                LocalBluetoothManager.getInstance(mContext, null));
+                LocalBluetoothManager.create(mContext, getDependency(BG_HANDLER)));
 
         mProviders.put(VolumeDialogController.class, () ->
                 new VolumeDialogControllerImpl(mContext));
diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
index acc7b49..77f4bf5 100644
--- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
+++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
@@ -35,6 +35,8 @@
 import android.view.SurfaceHolder;
 import android.view.WindowManager;
 
+import com.android.internal.annotations.VisibleForTesting;
+
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -77,6 +79,13 @@
             unloadWallpaper(false /* forgetSize */);
         };
 
+        // Surface is rejected if size below a threshold on some devices (ie. 8px on elfin)
+        // set min to 64 px (CTS covers this)
+        @VisibleForTesting
+        static final int MIN_BACKGROUND_WIDTH = 64;
+        @VisibleForTesting
+        static final int MIN_BACKGROUND_HEIGHT = 64;
+
         Bitmap mBackground;
         int mBackgroundWidth = -1, mBackgroundHeight = -1;
         int mLastSurfaceWidth = -1, mLastSurfaceHeight = -1;
@@ -156,9 +165,9 @@
                 hasWallpaper = false;
             }
 
-            // Force the wallpaper to cover the screen in both dimensions
-            int surfaceWidth = Math.max(displayInfo.logicalWidth, mBackgroundWidth);
-            int surfaceHeight = Math.max(displayInfo.logicalHeight, mBackgroundHeight);
+            // Set surface size equal to bitmap size, prevent memory waste
+            int surfaceWidth = Math.max(MIN_BACKGROUND_WIDTH, mBackgroundWidth);
+            int surfaceHeight = Math.max(MIN_BACKGROUND_HEIGHT, mBackgroundHeight);
 
             // Used a fixed size surface, because we are special.  We can do
             // this because we know the current design of window animations doesn't
@@ -257,7 +266,8 @@
             drawFrame();
         }
 
-        private DisplayInfo getDefaultDisplayInfo() {
+        @VisibleForTesting
+        DisplayInfo getDefaultDisplayInfo() {
             mDefaultDisplay.getDisplayInfo(mTmpDisplayInfo);
             return mTmpDisplayInfo;
         }
@@ -420,7 +430,8 @@
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         }
 
-        private void updateBitmap(Bitmap bitmap) {
+        @VisibleForTesting
+        void updateBitmap(Bitmap bitmap) {
             mBackground = null;
             mBackgroundWidth = -1;
             mBackgroundHeight = -1;
diff --git a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
index cafdc10..bd2b7a5 100644
--- a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
+++ b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
@@ -32,6 +32,7 @@
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.Log;
+import android.view.MotionEvent;
 
 import com.android.systemui.OverviewProxyService.OverviewProxyListener;
 import com.android.systemui.recents.events.EventBus;
@@ -111,6 +112,21 @@
             }
         }
 
+        public void onStatusBarMotionEvent(MotionEvent event) {
+            long token = Binder.clearCallingIdentity();
+            try {
+                // TODO move this logic to message queue
+                mHandler.post(()->{
+                    StatusBar bar = SysUiServiceProvider.getComponent(mContext, StatusBar.class);
+                    if (bar != null) {
+                        bar.dispatchNotificationsPanelTouchEvent(event);
+                    }
+                });
+            } finally {
+                Binder.restoreCallingIdentity(token);
+            }
+        }
+
         public void onSplitScreenInvoked() {
             if (!verifyCaller("onSplitScreenInvoked")) {
                 return;
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java
index 6e62b0d..8fe577a 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java
@@ -36,7 +36,7 @@
  * FingerprintDialogView).
  */
 public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callbacks {
-    private static final String TAG = "FingerprintDialogImpl";
+    private static final String TAG = "BiometricDialogImpl";
     private static final boolean DEBUG = true;
 
     private static final int MSG_SHOW_DIALOG = 1;
@@ -120,8 +120,8 @@
     }
 
     @Override
-    public void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver) {
-        if (DEBUG) Log.d(TAG, "showBiometricDialog");
+    public void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver, int type) {
+        if (DEBUG) Log.d(TAG, "showBiometricDialog, type: " + type);
         // Remove these messages as they are part of the previous client
         mHandler.removeMessages(MSG_BIOMETRIC_ERROR);
         mHandler.removeMessages(MSG_BIOMETRIC_HELP);
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index a195fc9..06d4434 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -100,7 +100,7 @@
  * is provisioned.
  */
 class GlobalActionsDialog implements DialogInterface.OnDismissListener,
-        DialogInterface.OnClickListener {
+        DialogInterface.OnClickListener, DialogInterface.OnShowListener {
 
     static public final String SYSTEM_DIALOG_REASON_KEY = "reason";
     static public final String SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS = "globalactions";
@@ -397,6 +397,7 @@
         dialog.setKeyguardShowing(mKeyguardShowing);
 
         dialog.setOnDismissListener(this);
+        dialog.setOnShowListener(this);
 
         return dialog;
     }
@@ -458,6 +459,7 @@
 
         @Override
         public void onPress() {
+            MetricsLogger.action(mContext, MetricsEvent.ACTION_EMERGENCY_DIALER_FROM_POWER_MENU);
             Intent intent = new Intent(ACTION_EMERGENCY_DIALER_DIAL);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             mContext.startActivityAsUser(intent, UserHandle.CURRENT);
@@ -862,6 +864,11 @@
         item.onPress();
     }
 
+    /** {@inheritDoc} */
+    public void onShow(DialogInterface dialog) {
+        MetricsLogger.visible(mContext, MetricsEvent.POWER_MENU);
+    }
+
     /**
      * The adapter used for the list within the global actions dialog, taking
      * into account whether the keyguard is showing via
diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java b/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java
index 76a1acc..e0657c9 100644
--- a/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java
+++ b/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java
@@ -49,6 +49,7 @@
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
 import com.android.settingslib.bluetooth.BluetoothUtils;
+import com.android.systemui.Dependency;
 import com.android.systemui.R;
 import com.android.systemui.SystemUI;
 
@@ -171,7 +172,7 @@
             return;
         }
 
-        LocalBluetoothManager bluetoothManager = LocalBluetoothManager.getInstance(context, null);
+        LocalBluetoothManager bluetoothManager = Dependency.get(LocalBluetoothManager.class);
         if (bluetoothManager == null)  {
             if (DEBUG) {
                 Slog.e(TAG, "Failed to retrieve LocalBluetoothManager instance");
diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index f1b7eec..ca1b489 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -261,6 +261,12 @@
         return mPages.get(0).mColumns;
     }
 
+    public int getNumVisibleTiles() {
+        if (mPages.size() == 0) return 0;
+        TilePage currentPage = mPages.get(getCurrentItem());
+        return currentPage.mRecords.size();
+    }
+
     public void startTileReveal(Set<String> tileSpecs, final Runnable postAnimation) {
         if (tileSpecs.isEmpty() || mPages.size() < 2 || getScrollX() != 0 || !beginFakeDrag()) {
             // Do not start the reveal animation unless there are tiles to animate, multiple
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
index 2a4bb60..3744d7d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
@@ -155,6 +155,7 @@
         TouchAnimator.Builder translationYBuilder = new Builder();
 
         if (mQsPanel.getHost() == null) return;
+        if (mQuickQsPanel.getTileLayout().getNumVisibleTiles() < 1) return;
         Collection<QSTile> tiles = mQsPanel.getHost().getTiles();
         int count = 0;
         int[] loc1 = new int[2];
@@ -169,6 +170,7 @@
         QSTileLayout tileLayout = mQsPanel.getTileLayout();
         mAllViews.add((View) tileLayout);
         int height = mQs.getView() != null ? mQs.getView().getMeasuredHeight() : 0;
+        int width = mQs.getView() != null ? mQs.getView().getMeasuredWidth() : 0;
         int heightDiff = height - mQs.getHeader().getBottom()
                 + mQs.getHeader().getPaddingBottom();
         firstPageBuilder.addFloat(tileLayout, "translationY", heightDiff, 0);
@@ -181,7 +183,9 @@
             }
             final View tileIcon = tileView.getIcon().getIconView();
             View view = mQs.getView();
-            if (count < mNumQuickTiles && mAllowFancy) {
+
+            // This case: less tiles to animate in small displays.
+            if (count < mQuickQsPanel.getTileLayout().getNumVisibleTiles() && mAllowFancy) {
                 // Quick tiles.
                 QSTileView quickTileView = mQuickQsPanel.getTileView(tile);
                 if (quickTileView == null) continue;
@@ -192,18 +196,26 @@
                 final int xDiff = loc2[0] - loc1[0];
                 final int yDiff = loc2[1] - loc1[1];
                 lastXDiff = loc1[0] - lastX;
-                // Move the quick tile right from its location to the new one.
-                translationXBuilder.addFloat(quickTileView, "translationX", 0, xDiff);
-                translationYBuilder.addFloat(quickTileView, "translationY", 0, yDiff);
 
-                // Counteract the parent translation on the tile. So we have a static base to
-                // animate the label position off from.
-                //firstPageBuilder.addFloat(tileView, "translationY", mQsPanel.getHeight(), 0);
+                if (count < tileLayout.getNumVisibleTiles()) {
+                    // Move the quick tile right from its location to the new one.
+                    translationXBuilder.addFloat(quickTileView, "translationX", 0, xDiff);
+                    translationYBuilder.addFloat(quickTileView, "translationY", 0, yDiff);
 
-                // Move the real tile from the quick tile position to its final
-                // location.
-                translationXBuilder.addFloat(tileView, "translationX", -xDiff, 0);
-                translationYBuilder.addFloat(tileView, "translationY", -yDiff, 0);
+                    // Counteract the parent translation on the tile. So we have a static base to
+                    // animate the label position off from.
+                    //firstPageBuilder.addFloat(tileView, "translationY", mQsPanel.getHeight(), 0);
+
+                    // Move the real tile from the quick tile position to its final
+                    // location.
+                    translationXBuilder.addFloat(tileView, "translationX", -xDiff, 0);
+                    translationYBuilder.addFloat(tileView, "translationY", -yDiff, 0);
+
+                } else { // These tiles disappear when expanding
+                    firstPageBuilder.addFloat(quickTileView, "alpha", 1, 0);
+                    translationYBuilder.addFloat(quickTileView, "translationY", 0, yDiff);
+                    translationXBuilder.addFloat(quickTileView, "translationX", 0, xDiff + width);
+                }
 
                 mQuickQsViews.add(tileView.getIconWithBackground());
                 mAllViews.add(tileView.getIcon());
@@ -218,10 +230,9 @@
                 final int xDiff = loc2[0] - loc1[0];
                 final int yDiff = loc2[1] - loc1[1];
 
-                firstPageBuilder.addFloat(tileView, "translationY", heightDiff, 0);
-                translationXBuilder.addFloat(tileView, "translationX", -xDiff, 0);
+                firstPageBuilder.addFloat(tileView, "translationY", -heightDiff, 0);
                 translationYBuilder.addFloat(tileView, "translationY", -yDiff, 0);
-                translationYBuilder.addFloat(tileIcon, "translationY", -yDiff, 0);
+                translationXBuilder.addFloat(tileView, "translationX", -xDiff, 0);
 
                 mAllViews.add(tileIcon);
             } else {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index 3fc258b..6c330b0 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -663,5 +663,7 @@
         void setListening(boolean listening);
 
         default void setExpansion(float expansion) {}
+
+        int getNumVisibleTiles();
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
index 1c50f79..556786a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
@@ -18,18 +18,17 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
+import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.Space;
 
 import com.android.systemui.Dependency;
 import com.android.systemui.R;
 import com.android.systemui.plugins.qs.QSTile;
 import com.android.systemui.plugins.qs.QSTile.SignalState;
 import com.android.systemui.plugins.qs.QSTile.State;
-import com.android.systemui.plugins.qs.QSTileView;
 import com.android.systemui.qs.customize.QSCustomizer;
 import com.android.systemui.tuner.TunerService;
 import com.android.systemui.tuner.TunerService.Tunable;
@@ -43,6 +42,7 @@
 public class QuickQSPanel extends QSPanel {
 
     public static final String NUM_QUICK_TILES = "sysui_qqs_count";
+    private static final String TAG = "QuickQSPanel";
 
     private boolean mDisabledByPolicy;
     private static int mDefaultMaxTiles;
@@ -178,121 +178,95 @@
         super.setVisibility(visibility);
     }
 
-    private static class HeaderTileLayout extends LinearLayout implements QSTileLayout {
+    private static class HeaderTileLayout extends TileLayout {
 
-        protected final ArrayList<TileRecord> mRecords = new ArrayList<>();
         private boolean mListening;
-        /** Size of the QS tile (width & height). */
-        private int mTileDimensionSize;
 
         public HeaderTileLayout(Context context) {
             super(context);
             setClipChildren(false);
             setClipToPadding(false);
-
-            mTileDimensionSize = mContext.getResources().getDimensionPixelSize(
-                    R.dimen.qs_quick_tile_size);
-            updateLayoutParams();
         }
 
         @Override
         protected void onConfigurationChanged(Configuration newConfig) {
             super.onConfigurationChanged(newConfig);
-            updateLayoutParams();
+            updateResources();
+        }
+
+        @Override
+        public void onFinishInflate(){
+            updateResources();
         }
 
         private void updateLayoutParams() {
-            setGravity(Gravity.CENTER);
             int width = getResources().getDimensionPixelSize(R.dimen.qs_quick_layout_width);
-            LayoutParams lp = new LayoutParams(width, LayoutParams.MATCH_PARENT);
+            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(width, LayoutParams.MATCH_PARENT);
             lp.gravity = Gravity.CENTER_HORIZONTAL;
             setLayoutParams(lp);
         }
 
-        /**
-         * Returns {@link LayoutParams} based on the given {@code spaceWidth}. If the width is 0,
-         * then we're going to have the space expand to take up as much space as possible. If the
-         * width is non-zero, we want the inter-tile spacers to be fixed.
-         */
-        private LayoutParams generateSpaceLayoutParams() {
-            LayoutParams lp = new LayoutParams(0, mTileDimensionSize);
-            lp.weight = 1;
-            lp.gravity = Gravity.CENTER;
-            return lp;
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (mListening == listening) return;
-            mListening = listening;
-            for (TileRecord record : mRecords) {
-                record.tile.setListening(this, mListening);
-            }
-        }
-
-        @Override
-        public void addTile(TileRecord tile) {
-            if (getChildCount() != 0) {
-                addView(new Space(mContext), getChildCount(), generateSpaceLayoutParams());
-            }
-
-            addView(tile.tileView, getChildCount(), generateTileLayoutParams());
-            mRecords.add(tile);
-            tile.tile.setListening(this, mListening);
-        }
-
         private LayoutParams generateTileLayoutParams() {
-            LayoutParams lp = new LayoutParams(mTileDimensionSize, mTileDimensionSize);
-            lp.gravity = Gravity.CENTER;
+            LayoutParams lp = new LayoutParams(mCellWidth, mCellHeight);
             return lp;
         }
 
         @Override
-        public void removeTile(TileRecord tile) {
-            int childIndex = getChildIndex(tile.tileView);
-            // Remove the tile.
-            removeViewAt(childIndex);
-            if (getChildCount() != 0) {
-                // Remove its spacer as well.
-                removeViewAt(childIndex);
-            }
-            mRecords.remove(tile);
-            tile.tile.setListening(this, false);
-        }
-
-        private int getChildIndex(QSTileView tileView) {
-            final int childViewCount = getChildCount();
-            for (int i = 0; i < childViewCount; i++) {
-                if (getChildAt(i) == tileView) {
-                    return i;
-                }
-            }
-            return -1;
+        protected void addTileView(TileRecord tile) {
+            addView(tile.tileView, getChildCount(), generateTileLayoutParams());
         }
 
         @Override
-        public int getOffsetTop(TileRecord tile) {
-            return 0;
+        protected void onLayout(boolean changed, int l, int t, int r, int b) {
+            // We only care about clipping on the right side
+            Rect bounds = new Rect(0, 0, r - l, 10000);
+            setClipBounds(bounds);
+
+            calculateColumns();
+
+            for (int i = 0; i < mRecords.size(); i++) {
+                mRecords.get(i).tileView.setVisibility( i < mColumns ? View.VISIBLE : View.GONE);
+            }
+
+            setAccessibilityOrder();
+            layoutTileRecords(mColumns);
         }
 
         @Override
         public boolean updateResources() {
-            // No resources here.
+            mCellWidth = mContext.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_size);
+            mCellHeight = mCellWidth;
+
+            updateLayoutParams();
+
             return false;
         }
 
-        @Override
-        public boolean hasOverlappingRendering() {
-            return false;
-        }
+        private boolean calculateColumns() {
+            int prevNumColumns = mColumns;
+            int maxTiles = mRecords.size();
 
-        @Override
-        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-            if (hideOverflowingChildren(widthMeasureSpec)) {
-                return; // Rely on visibility change to trigger remeasure.
+            if (maxTiles == 0){ // Early return during setup
+                mColumns = 0;
+                return true;
             }
 
+            final int availableWidth = getMeasuredWidth() - getPaddingStart() - getPaddingEnd();
+            final int leftoverWithespace = availableWidth - maxTiles * mCellWidth;
+            final int smallestHorizontalMarginNeeded = leftoverWithespace / (maxTiles - 1);
+
+            if (smallestHorizontalMarginNeeded > 0){
+                mCellMarginHorizontal = smallestHorizontalMarginNeeded;
+                mColumns = maxTiles;
+            } else{
+                mColumns = mCellWidth == 0 ? 1 :
+                        Math.min(maxTiles, availableWidth / mCellWidth );
+                mCellMarginHorizontal = (availableWidth - mColumns * mCellWidth) / (mColumns - 1);
+            }
+            return mColumns != prevNumColumns;
+        }
+
+        private void setAccessibilityOrder() {
             if (mRecords != null && mRecords.size() > 0) {
                 View previousView = this;
                 for (TileRecord record : mRecords) {
@@ -306,31 +280,28 @@
             }
         }
 
-        /**
-         * Hide child views that would otherwise be clipped.
-         * @return {@code true} if any child visibilities have changed.
-         */
-        private boolean hideOverflowingChildren(int widthMeasureSpec) {
-            if (getChildCount() == 0) {
-                return false;
+        @Override
+        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            // Measure each QS tile.
+            for (TileRecord record : mRecords) {
+                if (record.tileView.getVisibility() == GONE) continue;
+                record.tileView.measure(exactly(mCellWidth), exactly(mCellHeight));
             }
-            boolean childVisibilityChanged = false;
-            int widthRemaining = MeasureSpec.getSize(widthMeasureSpec)
-                - getChildAt(0).getMeasuredWidth() - getPaddingStart() - getPaddingEnd();
-            for (int i = 2; i < getChildCount(); i += 2) {
-                View tileChild = getChildAt(i);
-                LayoutParams lp = (LayoutParams) tileChild.getLayoutParams();
-                // All Space views have 0 width; only tiles contribute to the total width.
-                widthRemaining = widthRemaining
-                    - tileChild.getMeasuredWidth() - lp.getMarginEnd() - lp.getMarginStart();
-                int newVisibility = widthRemaining < 0 ? View.GONE : View.VISIBLE;
-                if (tileChild.getVisibility() != newVisibility) {
-                    tileChild.setVisibility(newVisibility);
-                    getChildAt(i - 1).setVisibility(newVisibility); // Hide spacer as well.
-                    childVisibilityChanged = true;
-                }
-            }
-            return childVisibilityChanged;
+
+            int height = mCellHeight;
+            if (height < 0) height = 0;
+
+            setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), height);
+        }
+
+        @Override
+        public int getNumVisibleTiles() {
+            return mColumns;
+        }
+
+        @Override
+        protected int getColumnStart(int column) {
+            return getPaddingStart() + column *  (mCellWidth + mCellMarginHorizontal);
         }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
index 45d63e0..c67165e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
@@ -56,6 +56,10 @@
     public void addTile(TileRecord tile) {
         mRecords.add(tile);
         tile.tile.setListening(this, mListening);
+        addTileView(tile);
+    }
+
+    protected void addTileView(TileRecord tile) {
         addView(tile.tileView);
     }
 
@@ -120,19 +124,18 @@
         return false;
     }
 
-    private static int exactly(int size) {
+    protected static int exactly(int size) {
         return MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);
     }
 
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        final int w = getWidth();
+
+    protected void layoutTileRecords(int numRecords) {
         final boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
         int row = 0;
         int column = 0;
 
         // Layout each QS tile.
-        for (int i = 0; i < mRecords.size(); i++, column++) {
+        for (int i = 0; i < numRecords; i++, column++) {
             // If we reached the last column available to layout a tile, wrap back to the next row.
             if (column == mColumns) {
                 column = 0;
@@ -147,12 +150,22 @@
         }
     }
 
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        layoutTileRecords(mRecords.size());
+    }
+
     private int getRowTop(int row) {
         return row * (mCellHeight + mCellMarginVertical) + mCellMarginTop;
     }
 
-    private int getColumnStart(int column) {
+    protected int getColumnStart(int column) {
         return getPaddingStart() + mSidePadding + mCellMarginHorizontal / 2 +
                 column *  (mCellWidth + mCellMarginHorizontal);
     }
+
+    @Override
+    public int getNumVisibleTiles() {
+        return mRecords.size();
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
index ae99786..bb65bed 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
@@ -31,15 +31,15 @@
 import android.service.quicksettings.IQSTileService;
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;
+import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.view.IWindowManager;
 import android.view.WindowManagerGlobal;
-import com.android.internal.logging.MetricsLogger;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.systemui.Dependency;
 import com.android.systemui.plugins.ActivityStarter;
-import com.android.systemui.plugins.qs.QSTile;
 import com.android.systemui.plugins.qs.QSTile.State;
 import com.android.systemui.qs.tileimpl.QSTileImpl;
 import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener;
@@ -68,9 +68,9 @@
     private final TileServiceManager mServiceManager;
     private final int mUser;
     private android.graphics.drawable.Icon mDefaultIcon;
+    private CharSequence mDefaultLabel;
 
     private boolean mListening;
-    private boolean mBound;
     private boolean mIsTokenGranted;
     private boolean mIsShowingDialog;
 
@@ -79,7 +79,7 @@
         mWindowManager = WindowManagerGlobal.getWindowManagerService();
         mComponent = ComponentName.unflattenFromString(action);
         mTile = new Tile();
-        setTileIcon();
+        updateDefaultTileAndIcon();
         mServiceManager = host.getTileServices().getTileWrapper(this);
         mService = mServiceManager.getTileService();
         mServiceManager.setTileChangeListener(this);
@@ -91,13 +91,14 @@
         return CUSTOM_STALE_TIMEOUT + DateUtils.MINUTE_IN_MILLIS * mHost.indexOf(getTileSpec());
     }
 
-    private void setTileIcon() {
+    private void updateDefaultTileAndIcon() {
         try {
             PackageManager pm = mContext.getPackageManager();
             int flags = PackageManager.MATCH_DIRECT_BOOT_UNAWARE | PackageManager.MATCH_DIRECT_BOOT_AWARE;
             if (isSystemApp(pm)) {
                 flags |= PackageManager.MATCH_DISABLED_COMPONENTS;
             }
+
             ServiceInfo info = pm.getServiceInfo(mComponent, flags);
             int icon = info.icon != 0 ? info.icon
                     : info.applicationInfo.icon;
@@ -109,12 +110,16 @@
             if (updateIcon) {
                 mTile.setIcon(mDefaultIcon);
             }
-            // Update the label if there is no label.
-            if (mTile.getLabel() == null) {
-                mTile.setLabel(info.loadLabel(pm));
+            // Update the label if there is no label or it is the default label.
+            boolean updateLabel = mTile.getLabel() == null
+                    || TextUtils.equals(mTile.getLabel(), mDefaultLabel);
+            mDefaultLabel = info.loadLabel(pm);
+            if (updateLabel) {
+                mTile.setLabel(mDefaultLabel);
             }
-        } catch (Exception e) {
+        } catch (PackageManager.NameNotFoundException e) {
             mDefaultIcon = null;
+            mDefaultLabel = null;
         }
     }
 
@@ -148,7 +153,7 @@
 
     @Override
     public void onTileChanged(ComponentName tile) {
-        setTileIcon();
+        updateDefaultTileAndIcon();
     }
 
     @Override
@@ -170,6 +175,7 @@
     }
 
     public Tile getQsTile() {
+        updateDefaultTileAndIcon();
         return mTile;
     }
 
@@ -199,7 +205,7 @@
         mListening = listening;
         try {
             if (listening) {
-                setTileIcon();
+                updateDefaultTileAndIcon();
                 refreshState();
                 if (!mServiceManager.isActiveTile()) {
                     mServiceManager.setBindRequested(true);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
index b6a776f..451297b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
@@ -40,6 +40,7 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.MetricsLogger;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.Utils;
 import com.android.systemui.Dependency;
 import com.android.systemui.Prefs;
@@ -360,9 +361,9 @@
     }
 
     protected void checkIfRestrictionEnforcedByAdminOnly(State state, String userRestriction) {
-        EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
+        EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,
                 userRestriction, ActivityManager.getCurrentUser());
-        if (admin != null && !RestrictedLockUtils.hasBaseUserRestriction(mContext,
+        if (admin != null && !RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
                 userRestriction, ActivityManager.getCurrentUser())) {
             state.disabledByPolicy = true;
             mEnforcedAdmin = admin;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
index 91512dd..b7eee36 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
@@ -262,16 +262,10 @@
             }
 
             if (navigationBarView != null) {
-                int dualToneDarkTheme = Utils.getThemeAttr(getContext(), R.attr.darkIconTheme);
-                int dualToneLightTheme = Utils.getThemeAttr(getContext(), R.attr.lightIconTheme);
-                Context lightContext = new ContextThemeWrapper(getContext(), dualToneLightTheme);
-                Context darkContext = new ContextThemeWrapper(getContext(), dualToneDarkTheme);
                 ((ImageView) mLayout.findViewById(R.id.screen_pinning_back_icon))
-                        .setImageDrawable(navigationBarView.getBackDrawable(lightContext,
-                                darkContext));
+                        .setImageDrawable(navigationBarView.getBackDrawable());
                 ((ImageView) mLayout.findViewById(R.id.screen_pinning_home_icon))
-                        .setImageDrawable(navigationBarView.getHomeDrawable(lightContext,
-                                darkContext));
+                        .setImageDrawable(navigationBarView.getHomeDrawable());
             }
 
             ((TextView) mLayout.findViewById(R.id.screen_pinning_description))
diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
index be0aa11..1178725 100644
--- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
+++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
@@ -44,6 +44,7 @@
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.systemui.Dependency;
 
 import java.util.ArrayList;
@@ -399,7 +400,7 @@
             @Override
             public void run() {
                 ((ToggleSliderView)mControl).setEnforcedAdmin(
-                        RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
+                        RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,
                                 UserManager.DISALLOW_CONFIG_BRIGHTNESS,
                                 mUserTracker.getCurrentUserId()));
             }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index 909cd79..e19c844 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -160,7 +160,8 @@
 
         default void onRotationProposal(int rotation, boolean isValid) { }
 
-        default void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver) { }
+        default void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver,
+                int type) { }
         default void onBiometricAuthenticated() { }
         default void onBiometricHelp(String message) { }
         default void onBiometricError(String error) { }
@@ -513,11 +514,12 @@
     }
 
     @Override
-    public void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver) {
+    public void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver, int type) {
         synchronized (mLock) {
             SomeArgs args = SomeArgs.obtain();
             args.arg1 = bundle;
             args.arg2 = receiver;
+            args.argi1 = type;
             mHandler.obtainMessage(MSG_BIOMETRIC_SHOW, args)
                     .sendToTarget();
         }
@@ -756,11 +758,14 @@
                     mHandler.removeMessages(MSG_BIOMETRIC_ERROR);
                     mHandler.removeMessages(MSG_BIOMETRIC_HELP);
                     mHandler.removeMessages(MSG_BIOMETRIC_AUTHENTICATED);
+                    SomeArgs someArgs = (SomeArgs) msg.obj;
                     for (int i = 0; i < mCallbacks.size(); i++) {
                         mCallbacks.get(i).showBiometricDialog(
-                                (Bundle)((SomeArgs)msg.obj).arg1,
-                                (IBiometricPromptReceiver)((SomeArgs)msg.obj).arg2);
+                                (Bundle) someArgs.arg1,
+                                (IBiometricPromptReceiver) someArgs.arg2,
+                                someArgs.argi1);
                     }
+                    someArgs.recycle();
                     break;
                 case MSG_BIOMETRIC_AUTHENTICATED:
                     for (int i = 0; i < mCallbacks.size(); i++) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java
index da6401c..67e512c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java
@@ -98,6 +98,13 @@
 
     private List<UserRecord> createUserRecords(List<UserInfo> userInfoList) {
         List<UserRecord> userRecords = new ArrayList<>();
+
+        // If the foreground user CANNOT switch to other users, only display the foreground user.
+        if (!mCarUserManagerHelper.canForegroundUserSwitchUsers()) {
+            userRecords.add(createForegroundUserRecord());
+            return userRecords;
+        }
+
         for (UserInfo userInfo : userInfoList) {
             if (userInfo.isGuest()) {
                 // Don't display guests in the switcher.
@@ -122,6 +129,11 @@
         return userRecords;
     }
 
+    private UserRecord createForegroundUserRecord() {
+        return new UserRecord(mCarUserManagerHelper.getCurrentForegroundUserInfo(),
+                false /* isStartGuestSession */, false /* isAddUser */, true /* isForeground */);
+    }
+
     /**
      * Create guest user record
      */
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
index b57a366..c094669 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
@@ -108,6 +108,7 @@
     private StatusBar mStatusBar;
     private final UnlockMethodCache mUnlockMethodCache;
     private final Context mContext;
+    private final int mWakeUpDelay;
     private int mPendingAuthenticatedUserId = -1;
     private BiometricSourceType mPendingAuthenticatedBioSourceType = null;
     private boolean mPendingShowBouncer;
@@ -131,6 +132,8 @@
         mScrimController = scrimController;
         mStatusBar = statusBar;
         mUnlockMethodCache = unlockMethodCache;
+        mWakeUpDelay = context.getResources().getInteger(
+                com.android.internal.R.integer.config_wakeUpDelayDoze);
     }
 
     public void setStatusBarKeyguardViewManager(
@@ -219,7 +222,7 @@
         // During wake and unlock, we need to draw black before waking up to avoid abrupt
         // brightness changes due to display state transitions.
         boolean alwaysOnEnabled = DozeParameters.getInstance(mContext).getAlwaysOn();
-        boolean delayWakeUp = mode == MODE_WAKE_AND_UNLOCK && alwaysOnEnabled;
+        boolean delayWakeUp = mode == MODE_WAKE_AND_UNLOCK && alwaysOnEnabled && mWakeUpDelay > 0;
         Runnable wakeUp = ()-> {
             if (!wasDeviceInteractive) {
                 if (DEBUG_BIO_WAKELOCK) {
@@ -271,7 +274,7 @@
                 }
                 mStatusBarWindowController.setStatusBarFocusable(false);
                 if (delayWakeUp) {
-                    mHandler.postDelayed(wakeUp, 50);
+                    mHandler.postDelayed(wakeUp, mWakeUpDelay);
                 } else {
                     mKeyguardViewMediator.onWakeAndUnlocking();
                 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
index b84ee03..10b019d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
@@ -49,7 +49,6 @@
 import android.database.ContentObserver;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
-import android.graphics.drawable.AnimatedVectorDrawable;
 import android.inputmethodservice.InputMethodService;
 import android.os.Binder;
 import android.os.Bundle;
@@ -532,12 +531,6 @@
         KeyButtonDrawable kbd = rotBtn.getImageDrawable();
         if (kbd == null) return;
 
-        // The KBD and AVD is recreated every new valid suggestion because of style changes.
-        AnimatedVectorDrawable animIcon = null;
-        if (kbd.getDrawable(0) instanceof AnimatedVectorDrawable) {
-            animIcon = (AnimatedVectorDrawable) kbd.getDrawable(0);
-        }
-
         // Clear any pending suggestion flag as it has either been nullified or is being shown
         mPendingRotationSuggestion = false;
         if (getView() != null) getView().removeCallbacks(mCancelPendingRotationProposal);
@@ -554,9 +547,9 @@
             view.setAlpha(1f);
 
             // Run the rotate icon's animation if it has one
-            if (animIcon != null) {
-                animIcon.reset();
-                animIcon.start();
+            if (kbd.canAnimate()) {
+                kbd.resetAnimation();
+                kbd.startAnimation();
             }
 
             if (!isRotateSuggestionIntroduced()) mViewRippler.start(view);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 1892d37..2141016 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -80,7 +80,6 @@
 import com.android.systemui.stackdivider.Divider;
 import com.android.systemui.statusbar.policy.DeadZone;
 import com.android.systemui.statusbar.policy.KeyButtonDrawable;
-import com.android.systemui.statusbar.policy.TintedKeyButtonDrawable;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -124,14 +123,12 @@
 
     private KeyButtonDrawable mBackIcon;
     private KeyButtonDrawable mHomeDefaultIcon;
-    private KeyButtonDrawable mBackCarModeIcon;
-    private KeyButtonDrawable mHomeCarModeIcon;
     private KeyButtonDrawable mRecentIcon;
     private KeyButtonDrawable mDockedIcon;
     private KeyButtonDrawable mImeIcon;
     private KeyButtonDrawable mMenuIcon;
     private KeyButtonDrawable mAccessibilityIcon;
-    private TintedKeyButtonDrawable mRotateSuggestionIcon;
+    private KeyButtonDrawable mRotateSuggestionIcon;
 
     private GestureHelper mGestureHelper;
     private final DeadZone mDeadZone;
@@ -461,62 +458,47 @@
                 && ((mOverviewProxyService.getInteractionFlags() & FLAG_DISABLE_QUICK_SCRUB) == 0);
     }
 
-    private void updateCarModeIcons(Context ctx) {
-        mBackCarModeIcon = getDrawable(ctx, R.drawable.ic_sysbar_back_carmode);
-        mHomeCarModeIcon = getDrawable(ctx, R.drawable.ic_sysbar_home_carmode);
-    }
-
     private void reloadNavIcons() {
-        updateIcons(mContext, Configuration.EMPTY, mConfiguration);
+        updateIcons(Configuration.EMPTY, mConfiguration);
     }
 
-    private void updateIcons(Context ctx, Configuration oldConfig, Configuration newConfig) {
-        int dualToneDarkTheme = Utils.getThemeAttr(ctx, R.attr.darkIconTheme);
-        int dualToneLightTheme = Utils.getThemeAttr(ctx, R.attr.lightIconTheme);
-        Context lightContext = new ContextThemeWrapper(ctx, dualToneLightTheme);
-        Context darkContext = new ContextThemeWrapper(ctx, dualToneDarkTheme);
-
+    private void updateIcons(Configuration oldConfig, Configuration newConfig) {
         final boolean orientationChange = oldConfig.orientation != newConfig.orientation;
         final boolean densityChange = oldConfig.densityDpi != newConfig.densityDpi;
         final boolean dirChange = oldConfig.getLayoutDirection() != newConfig.getLayoutDirection();
 
         if (orientationChange || densityChange) {
-            mDockedIcon = getDrawable(lightContext, darkContext, R.drawable.ic_sysbar_docked);
-            mHomeDefaultIcon = getHomeDrawable(lightContext, darkContext);
+            mDockedIcon = getDrawable(R.drawable.ic_sysbar_docked);
+            mHomeDefaultIcon = getHomeDrawable();
         }
         if (densityChange || dirChange) {
-            mRecentIcon = getDrawable(lightContext, darkContext, R.drawable.ic_sysbar_recent);
-            mMenuIcon = getDrawable(lightContext, darkContext, R.drawable.ic_sysbar_menu);
+            mRecentIcon = getDrawable(R.drawable.ic_sysbar_recent);
+            mMenuIcon = getDrawable(R.drawable.ic_sysbar_menu);
 
-            mAccessibilityIcon = getDrawable(lightContext, darkContext,
-                    R.drawable.ic_sysbar_accessibility_button, false /* hasShadow */);
-
-            mImeIcon = getDrawable(lightContext, darkContext, R.drawable.ic_ime_switcher_default,
+            mAccessibilityIcon = getDrawable(R.drawable.ic_sysbar_accessibility_button,
                     false /* hasShadow */);
 
-            updateRotateSuggestionButtonStyle(mRotateBtnStyle, false);
+            mImeIcon = getDrawable(R.drawable.ic_ime_switcher_default, false /* hasShadow */);
 
-            if (ALTERNATE_CAR_MODE_UI) {
-                updateCarModeIcons(ctx);
-            }
+            updateRotateSuggestionButtonStyle(mRotateBtnStyle, false);
         }
         if (orientationChange || densityChange || dirChange) {
-            mBackIcon = getBackDrawable(lightContext, darkContext);
+            mBackIcon = getBackDrawable();
         }
     }
 
-    public KeyButtonDrawable getBackDrawable(Context lightContext, Context darkContext) {
-        KeyButtonDrawable drawable = chooseNavigationIconDrawable(lightContext, darkContext,
-                R.drawable.ic_sysbar_back, R.drawable.ic_sysbar_back_quick_step);
+    public KeyButtonDrawable getBackDrawable() {
+        KeyButtonDrawable drawable = chooseNavigationIconDrawable(R.drawable.ic_sysbar_back,
+                R.drawable.ic_sysbar_back_quick_step);
         orientBackButton(drawable);
         return drawable;
     }
 
-    public KeyButtonDrawable getHomeDrawable(Context lightContext, Context darkContext) {
+    public KeyButtonDrawable getHomeDrawable() {
         final boolean quickStepEnabled = mOverviewProxyService.shouldShowSwipeUpUI();
         KeyButtonDrawable drawable = quickStepEnabled
-                ? getDrawable(lightContext, darkContext, R.drawable.ic_sysbar_home_quick_step)
-                : getDrawable(lightContext, darkContext, R.drawable.ic_sysbar_home);
+                ? getDrawable(R.drawable.ic_sysbar_home_quick_step)
+                : getDrawable(R.drawable.ic_sysbar_home);
         orientHomeButton(drawable);
         return drawable;
     }
@@ -549,33 +531,26 @@
         drawable.setRotation(mVertical ? 90 : 0);
     }
 
-    private KeyButtonDrawable chooseNavigationIconDrawable(Context lightContext,
-            Context darkContext, @DrawableRes int icon, @DrawableRes int quickStepIcon) {
+    private KeyButtonDrawable chooseNavigationIconDrawable(@DrawableRes int icon,
+            @DrawableRes int quickStepIcon) {
         final boolean quickStepEnabled = mOverviewProxyService.shouldShowSwipeUpUI();
-        return quickStepEnabled
-                ? getDrawable(lightContext, darkContext, quickStepIcon)
-                : getDrawable(lightContext, darkContext, icon);
+        return quickStepEnabled ? getDrawable(quickStepIcon) : getDrawable(icon);
     }
 
-    private KeyButtonDrawable getDrawable(Context lightContext, Context darkContext,
-            @DrawableRes int icon) {
-        return getDrawable(lightContext, darkContext, icon, true /* hasShadow */);
+    private KeyButtonDrawable getDrawable(@DrawableRes int icon) {
+        return getDrawable(mContext, icon, true /* hasShadow */);
     }
 
-    private KeyButtonDrawable getDrawable(Context lightContext, Context darkContext,
-            @DrawableRes int icon, boolean hasShadow) {
-        return KeyButtonDrawable.create(lightContext, lightContext.getDrawable(icon),
-                darkContext.getDrawable(icon), hasShadow);
+    private KeyButtonDrawable getDrawable(@DrawableRes int icon, boolean hasShadow) {
+        return getDrawable(mContext, icon, hasShadow);
     }
 
-    private KeyButtonDrawable getDrawable(Context ctx, @DrawableRes int icon) {
-        // Legacy image icons using a single image will not support shadows
-        return KeyButtonDrawable.create(ctx, ctx.getDrawable(icon), null, false /* hasShadow */);
-    }
-
-    private TintedKeyButtonDrawable getDrawable(Context ctx, @DrawableRes int icon,
-            @ColorInt int lightColor, @ColorInt int darkColor) {
-        return TintedKeyButtonDrawable.create(ctx.getDrawable(icon), lightColor, darkColor);
+    private KeyButtonDrawable getDrawable(Context ctx, @DrawableRes int icon, boolean hasShadow) {
+        final int dualToneDarkTheme = Utils.getThemeAttr(ctx, R.attr.darkIconTheme);
+        final int dualToneLightTheme = Utils.getThemeAttr(ctx, R.attr.lightIconTheme);
+        Context lightContext = new ContextThemeWrapper(ctx, dualToneLightTheme);
+        Context darkContext = new ContextThemeWrapper(ctx, dualToneDarkTheme);
+        return KeyButtonDrawable.create(lightContext, darkContext, icon, hasShadow);
     }
 
     @Override
@@ -585,10 +560,6 @@
         super.setLayoutDirection(layoutDirection);
     }
 
-    private KeyButtonDrawable getBackIcon(boolean carMode) {
-        return carMode ? mBackCarModeIcon : mBackIcon;
-    }
-
     public void setNavigationIconHints(int hints) {
         if (hints == mNavigationIconHints) return;
         final boolean backAlt = (hints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0;
@@ -626,9 +597,9 @@
         // to recent icon is not required.
         final boolean useAltBack =
                 (mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0;
-        KeyButtonDrawable backIcon = getBackIcon(mUseCarModeUi);
+        KeyButtonDrawable backIcon = mBackIcon;
         orientBackButton(backIcon);
-        KeyButtonDrawable homeIcon = mUseCarModeUi ? mHomeCarModeIcon : mHomeDefaultIcon;
+        KeyButtonDrawable homeIcon = mHomeDefaultIcon;
         if (!mUseCarModeUi) {
             orientHomeButton(homeIcon);
         }
@@ -845,31 +816,20 @@
         mRotateBtnStyle = style;
         final Context ctx = getContext();
 
-        // Extract the dark and light tints
-        final int dualToneDarkTheme = Utils.getThemeAttr(ctx, R.attr.darkIconTheme);
-        final int dualToneLightTheme = Utils.getThemeAttr(ctx, R.attr.lightIconTheme);
-        Context darkContext = new ContextThemeWrapper(ctx, dualToneDarkTheme);
-        Context lightContext = new ContextThemeWrapper(ctx, dualToneLightTheme);
-        final int lightColor = Utils.getColorAttrDefaultColor(lightContext, R.attr.singleToneColor);
-        final int darkColor = Utils.getColorAttrDefaultColor(darkContext, R.attr.singleToneColor);
-
         // Use the supplied style to set the icon's rotation parameters
         Context rotateContext = new ContextThemeWrapper(ctx, style);
 
         // Recreate the icon and set it if needed
-        TintedKeyButtonDrawable priorIcon = mRotateSuggestionIcon;
+        float previousIntensity = mRotateSuggestionIcon != null
+                ? mRotateSuggestionIcon.getDarkIntensity() : 0;
         mRotateSuggestionIcon = getDrawable(rotateContext, R.drawable.ic_sysbar_rotate_button,
-                lightColor, darkColor);
-
-        // Apply any prior set dark intensity
-        if (priorIcon != null && priorIcon.isDarkIntensitySet()) {
-            mRotateSuggestionIcon.setDarkIntensity(priorIcon.getDarkIntensity());
-        }
+                false /* hasShadow */);
+        mRotateSuggestionIcon.setDarkIntensity(previousIntensity);
 
         if (setIcon) getRotateSuggestionButton().setImageDrawable(mRotateSuggestionIcon);
     }
 
-    public int setRotateButtonVisibility(final boolean visible) {
+    public int setRotateButtonVisibility(boolean visible) {
         // Never show if a11y is visible
         final boolean adjVisible = visible && !mShowAccessibilityButton;
         final int vis = adjVisible ? View.VISIBLE : View.INVISIBLE;
@@ -881,13 +841,9 @@
         mShowRotateButton = visible;
 
         // Stop any active animations if hidden
-        if (!visible) {
-            Drawable d = mRotateSuggestionIcon.getDrawable(0);
-            if (d instanceof AnimatedVectorDrawable) {
-                AnimatedVectorDrawable avd = (AnimatedVectorDrawable) d;
-                avd.clearAnimationCallbacks();
-                avd.reset();
-            }
+        if (!visible && mRotateSuggestionIcon.canAnimate()) {
+            mRotateSuggestionIcon.clearAnimationCallbacks();
+            mRotateSuggestionIcon.resetAnimation();
         }
 
         // Hide/restore other button visibility, if necessary
@@ -1082,7 +1038,7 @@
         super.onConfigurationChanged(newConfig);
         boolean uiCarModeChanged = updateCarMode(newConfig);
         updateTaskSwitchHelper();
-        updateIcons(getContext(), mConfiguration, newConfig);
+        updateIcons(mConfiguration, newConfig);
         updateRecentsIcon();
         mRecentsOnboarding.onConfigurationChanged(newConfig);
         if (uiCarModeChanged || mConfiguration.densityDpi != newConfig.densityDpi
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NoisyVelocityTracker.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NoisyVelocityTracker.java
deleted file mode 100644
index 9c9b929..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NoisyVelocityTracker.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.systemui.statusbar.phone;
-
-import android.util.Log;
-import android.util.Pools;
-import android.view.MotionEvent;
-
-import java.util.ArrayDeque;
-import java.util.Iterator;
-
-/**
- * A very simple low-pass velocity filter for motion events for noisy touch screens.
- */
-public class NoisyVelocityTracker implements VelocityTrackerInterface {
-
-    private static final Pools.SynchronizedPool<NoisyVelocityTracker> sNoisyPool =
-            new Pools.SynchronizedPool<>(2);
-
-    private static final float DECAY = 0.75f;
-    private static final boolean DEBUG = false;
-
-    private final int MAX_EVENTS = 8;
-    private ArrayDeque<MotionEventCopy> mEventBuf = new ArrayDeque<MotionEventCopy>(MAX_EVENTS);
-    private float mVX, mVY = 0;
-
-    private static class MotionEventCopy {
-        public MotionEventCopy(float x2, float y2, long eventTime) {
-            this.x = x2;
-            this.y = y2;
-            this.t = eventTime;
-        }
-        float x, y;
-        long t;
-    }
-
-    public static NoisyVelocityTracker obtain() {
-        NoisyVelocityTracker instance = sNoisyPool.acquire();
-        return (instance != null) ? instance : new NoisyVelocityTracker();
-    }
-
-    private NoisyVelocityTracker() {
-    }
-
-    public void addMovement(MotionEvent event) {
-        if (mEventBuf.size() == MAX_EVENTS) {
-            mEventBuf.remove();
-        }
-        mEventBuf.add(new MotionEventCopy(event.getRawX(), event.getRawY(), event.getEventTime()));
-    }
-
-    public void computeCurrentVelocity(int units) {
-        if (NoisyVelocityTracker.DEBUG) {
-            Log.v("FlingTracker", "computing velocities for " + mEventBuf.size() + " events");
-        }
-        mVX = mVY = 0;
-        MotionEventCopy last = null;
-        int i = 0;
-        float totalweight = 0f;
-        float weight = 10f;
-        for (final Iterator<MotionEventCopy> iter = mEventBuf.iterator();
-                iter.hasNext();) {
-            final MotionEventCopy event = iter.next();
-            if (last != null) {
-                final float dt = (float) (event.t - last.t) / units;
-                final float dx = (event.x - last.x);
-                final float dy = (event.y - last.y);
-                if (NoisyVelocityTracker.DEBUG) {
-                    Log.v("FlingTracker", String.format(
-                            "   [%d] (t=%d %.1f,%.1f) dx=%.1f dy=%.1f dt=%f vx=%.1f vy=%.1f",
-                            i, event.t, event.x, event.y,
-                            dx, dy, dt,
-                            (dx/dt),
-                            (dy/dt)
-                    ));
-                }
-                if (event.t == last.t) {
-                    // Really not sure what to do with events that happened at the same time,
-                    // so we'll skip subsequent events.
-                    continue;
-                }
-                mVX += weight * dx / dt;
-                mVY += weight * dy / dt;
-                totalweight += weight;
-                weight *= DECAY;
-            }
-            last = event;
-            i++;
-        }
-        if (totalweight > 0) {
-            mVX /= totalweight;
-            mVY /= totalweight;
-        } else {
-            // so as not to contaminate the velocities with NaN
-            mVX = mVY = 0;
-        }
-
-        if (NoisyVelocityTracker.DEBUG) {
-            Log.v("FlingTracker", "computed: vx=" + mVX + " vy=" + mVY);
-        }
-    }
-
-    public float getXVelocity() {
-        if (Float.isNaN(mVX) || Float.isInfinite(mVX)) {
-            mVX = 0;
-        }
-        return mVX;
-    }
-
-    public float getYVelocity() {
-        if (Float.isNaN(mVY) || Float.isInfinite(mVX)) {
-            mVY = 0;
-        }
-        return mVY;
-    }
-
-    public void recycle() {
-        mEventBuf.clear();
-        sNoisyPool.release(this);
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index bef34f6..57c2439 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -29,6 +29,7 @@
 import android.util.Log;
 import android.view.InputDevice;
 import android.view.MotionEvent;
+import android.view.VelocityTracker;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewTreeObserver;
@@ -103,7 +104,7 @@
 
     private ValueAnimator mHeightAnimator;
     private ObjectAnimator mPeekAnimator;
-    private VelocityTrackerInterface mVelocityTracker;
+    private final VelocityTracker mVelocityTracker = VelocityTracker.obtain();
     private FlingAnimationUtils mFlingAnimationUtils;
     private FlingAnimationUtils mFlingAnimationUtilsClosing;
     private FlingAnimationUtils mFlingAnimationUtilsDismissing;
@@ -226,10 +227,6 @@
         mUnlockFalsingThreshold = res.getDimensionPixelSize(R.dimen.unlock_falsing_threshold);
     }
 
-    private void trackMovement(MotionEvent event) {
-        if (mVelocityTracker != null) mVelocityTracker.addMovement(event);
-    }
-
     public void setTouchAndAnimationDisabled(boolean disabled) {
         mTouchDisabled = disabled;
         if (mTouchDisabled) {
@@ -310,10 +307,7 @@
                 mTouchAboveFalsingThreshold = false;
                 mCollapsedAndHeadsUpOnDown = isFullyCollapsed()
                         && mHeadsUpManager.hasPinnedHeadsUp();
-                if (mVelocityTracker == null) {
-                    initVelocityTracker();
-                }
-                trackMovement(event);
+                mVelocityTracker.addMovement(event);
                 if (!mGestureWaitForTouchSlop || (mHeightAnimator != null && !mHintAnimationRunning)
                         || mPeekAnimator != null) {
                     mTouchSlopExceeded = (mHeightAnimator != null && !mHintAnimationRunning)
@@ -347,7 +341,7 @@
                 }
                 break;
             case MotionEvent.ACTION_MOVE:
-                trackMovement(event);
+                mVelocityTracker.addMovement(event);
                 float h = y - mInitialTouchY;
 
                 // If the panel was collapsed when touching, we only need to check for the
@@ -392,7 +386,7 @@
 
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
-                trackMovement(event);
+                mVelocityTracker.addMovement(event);
                 endMotionEvent(event, x, y, false /* forceCancel */);
                 break;
         }
@@ -458,14 +452,11 @@
                 || Math.abs(y - mInitialTouchY) > mTouchSlop
                 || event.getActionMasked() == MotionEvent.ACTION_CANCEL
                 || forceCancel) {
-            float vel = 0f;
-            float vectorVel = 0f;
-            if (mVelocityTracker != null) {
-                mVelocityTracker.computeCurrentVelocity(1000);
-                vel = mVelocityTracker.getYVelocity();
-                vectorVel = (float) Math.hypot(
-                        mVelocityTracker.getXVelocity(), mVelocityTracker.getYVelocity());
-            }
+            mVelocityTracker.computeCurrentVelocity(1000);
+            float vel = mVelocityTracker.getYVelocity();
+            float vectorVel = (float) Math.hypot(
+                    mVelocityTracker.getXVelocity(), mVelocityTracker.getYVelocity());
+
             boolean expand = flingExpands(vel, vectorVel, x, y)
                     || event.getActionMasked() == MotionEvent.ACTION_CANCEL
                     || forceCancel;
@@ -502,17 +493,11 @@
             onTrackingStopped(expands);
         }
 
-        if (mVelocityTracker != null) {
-            mVelocityTracker.recycle();
-            mVelocityTracker = null;
-        }
+        mVelocityTracker.clear();
         mPeekTouching = false;
     }
 
     protected float getCurrentExpandVelocity() {
-        if (mVelocityTracker == null) {
-            return 0;
-        }
         mVelocityTracker.computeCurrentVelocity(1000);
         return mVelocityTracker.getYVelocity();
     }
@@ -588,8 +573,7 @@
                 mHasLayoutedSinceDown = false;
                 mUpdateFlingOnLayout = false;
                 mTouchAboveFalsingThreshold = false;
-                initVelocityTracker();
-                trackMovement(event);
+                mVelocityTracker.addMovement(event);
                 break;
             case MotionEvent.ACTION_POINTER_UP:
                 final int upPointer = event.getPointerId(event.getActionIndex());
@@ -604,15 +588,12 @@
             case MotionEvent.ACTION_POINTER_DOWN:
                 if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) {
                     mMotionAborted = true;
-                    if (mVelocityTracker != null) {
-                        mVelocityTracker.recycle();
-                        mVelocityTracker = null;
-                    }
+                    mVelocityTracker.clear();
                 }
                 break;
             case MotionEvent.ACTION_MOVE:
                 final float h = y - mInitialTouchY;
-                trackMovement(event);
+                mVelocityTracker.addMovement(event);
                 if (scrolledToBottom || mTouchStartedInEmptyArea || mAnimatingOnDown) {
                     float hAbs = Math.abs(h);
                     if ((h < -mTouchSlop || (mAnimatingOnDown && hAbs > mTouchSlop))
@@ -625,10 +606,7 @@
                 break;
             case MotionEvent.ACTION_CANCEL:
             case MotionEvent.ACTION_UP:
-                if (mVelocityTracker != null) {
-                    mVelocityTracker.recycle();
-                    mVelocityTracker = null;
-                }
+                mVelocityTracker.clear();
                 break;
         }
         return false;
@@ -656,13 +634,6 @@
         }
     }
 
-    private void initVelocityTracker() {
-        if (mVelocityTracker != null) {
-            mVelocityTracker.recycle();
-        }
-        mVelocityTracker = VelocityTrackerFactory.obtain(getContext());
-    }
-
     protected boolean isScrolledToBottom() {
         return true;
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PlatformVelocityTracker.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PlatformVelocityTracker.java
deleted file mode 100644
index f589c3d..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PlatformVelocityTracker.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.systemui.statusbar.phone;
-
-import android.util.Pools;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-
-/**
- * An implementation of {@link VelocityTrackerInterface} using the platform-standard
- * {@link VelocityTracker}.
- */
-public class PlatformVelocityTracker implements VelocityTrackerInterface {
-
-    private static final Pools.SynchronizedPool<PlatformVelocityTracker> sPool =
-            new Pools.SynchronizedPool<>(2);
-
-    private VelocityTracker mTracker;
-
-    public static PlatformVelocityTracker obtain() {
-        PlatformVelocityTracker tracker = sPool.acquire();
-        if (tracker == null) {
-            tracker = new PlatformVelocityTracker();
-        }
-        tracker.setTracker(VelocityTracker.obtain());
-        return tracker;
-    }
-
-    public void setTracker(VelocityTracker tracker) {
-        mTracker = tracker;
-    }
-
-    @Override
-    public void addMovement(MotionEvent event) {
-        mTracker.addMovement(event);
-    }
-
-    @Override
-    public void computeCurrentVelocity(int units) {
-        mTracker.computeCurrentVelocity(units);
-    }
-
-    @Override
-    public float getXVelocity() {
-        return mTracker.getXVelocity();
-    }
-
-    @Override
-    public float getYVelocity() {
-        return mTracker.getYVelocity();
-    }
-
-    @Override
-    public void recycle() {
-        mTracker.recycle();
-        sPool.release(this);
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadowKeyDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadowKeyDrawable.java
deleted file mode 100644
index 8bd8048..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadowKeyDrawable.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.systemui.statusbar.phone;
-
-
-import android.graphics.Bitmap;
-import android.graphics.BlurMaskFilter;
-import android.graphics.BlurMaskFilter.Blur;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-/**
- * A drawable which adds shadow around a child drawable.
- */
-public class ShadowKeyDrawable extends Drawable {
-    private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
-
-    private final ShadowDrawableState mState;
-
-    public ShadowKeyDrawable(Drawable d) {
-        this(d, new ShadowDrawableState());
-    }
-
-    private ShadowKeyDrawable(Drawable d, ShadowDrawableState state) {
-        mState = state;
-        if (d != null) {
-            mState.mBaseHeight = d.getIntrinsicHeight();
-            mState.mBaseWidth = d.getIntrinsicWidth();
-            mState.mChangingConfigurations = d.getChangingConfigurations();
-            mState.mChildState = d.getConstantState();
-        }
-    }
-
-    public void setRotation(float degrees) {
-        if (mState.mRotateDegrees != degrees) {
-            mState.mRotateDegrees = degrees;
-            mState.mLastDrawnBitmap = null;
-            invalidateSelf();
-        }
-    }
-
-    public void setTranslationX(float x) {
-        setTranslation(x, mState.mTranslationY);
-    }
-
-    public void setTranslationY(float y) {
-        setTranslation(mState.mTranslationX, y);
-    }
-
-    public void setTranslation(float x, float y) {
-        if (mState.mTranslationX != x || mState.mTranslationY != y) {
-            mState.mTranslationX = x;
-            mState.mTranslationY = y;
-            mState.mLastDrawnBitmap = null;
-            invalidateSelf();
-        }
-    }
-
-    public void setShadowProperties(int x, int y, int size, int color) {
-        if (mState.mShadowOffsetX != x || mState.mShadowOffsetY != y
-                || mState.mShadowSize != size || mState.mShadowColor != color) {
-            mState.mShadowOffsetX = x;
-            mState.mShadowOffsetY = y;
-            mState.mShadowSize = size;
-            mState.mShadowColor = color;
-            mState.mLastDrawnBitmap = null;
-            invalidateSelf();
-        }
-    }
-
-    public float getRotation() {
-        return mState.mRotateDegrees;
-    }
-
-    public float getTranslationX() {
-        return mState.mTranslationX;
-    }
-
-    public float getTranslationY() {
-        return mState.mTranslationY;
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        Rect bounds = getBounds();
-        if (bounds.isEmpty()) {
-            return;
-        }
-
-        // If no cache or previous cached bitmap is hardware/software acceleration does not match
-        // the current canvas on draw then regenerate
-        if (mState.mLastDrawnBitmap == null
-                || mState.mIsHardwareBitmap != canvas.isHardwareAccelerated()) {
-            mState.mIsHardwareBitmap = canvas.isHardwareAccelerated();
-            regenerateBitmapCache();
-        }
-        canvas.drawBitmap(mState.mLastDrawnBitmap, null, bounds, mPaint);
-    }
-
-    @Override
-    public void setTint(int tintColor) {
-        super.setTint(tintColor);
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        mPaint.setAlpha(alpha);
-        invalidateSelf();
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) {
-        mPaint.setColorFilter(colorFilter);
-        invalidateSelf();
-    }
-
-    @Override
-    public ConstantState getConstantState() {
-        return mState;
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        return mState.mBaseHeight;
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        return mState.mBaseWidth;
-    }
-
-    @Override
-    public boolean canApplyTheme() {
-        return mState.canApplyTheme();
-    }
-
-    private void regenerateBitmapCache() {
-        final int width = getIntrinsicWidth();
-        final int height = getIntrinsicHeight();
-        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        canvas.save();
-        final float radians = (float) (mState.mRotateDegrees * Math.PI / 180);
-
-        // Rotate canvas before drawing original drawable if no shadow
-        if (mState.mShadowSize == 0) {
-            canvas.rotate(mState.mRotateDegrees, width / 2, height / 2);
-        }
-
-        // Call mutate, so that the pixel allocation by the underlying vector drawable is cleared.
-        final Drawable d = mState.mChildState.newDrawable().mutate();
-        d.setBounds(0, 0, mState.mBaseWidth, mState.mBaseHeight);
-        canvas.translate(mState.mTranslationX, mState.mTranslationY);
-        d.draw(canvas);
-
-        if (mState.mShadowSize > 0) {
-            // Draws the shadow
-            Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
-            paint.setMaskFilter(new BlurMaskFilter(mState.mShadowSize, Blur.NORMAL));
-            int[] offset = new int[2];
-
-            final Bitmap shadow = bitmap.extractAlpha(paint, offset);
-
-            paint.setMaskFilter(null);
-            paint.setColor(mState.mShadowColor);
-            bitmap.eraseColor(Color.TRANSPARENT);
-
-            canvas.rotate(mState.mRotateDegrees, width / 2, height / 2);
-
-            final float shadowOffsetX = (float) (Math.sin(radians) * mState.mShadowOffsetY
-                    + Math.cos(radians) * mState.mShadowOffsetX) - mState.mTranslationX;
-            final float shadowOffsetY = (float) (Math.cos(radians) * mState.mShadowOffsetY
-                    - Math.sin(radians) * mState.mShadowOffsetX) - mState.mTranslationY;
-
-            canvas.drawBitmap(shadow, offset[0] + shadowOffsetX, offset[1] + shadowOffsetY, paint);
-            d.draw(canvas);
-        }
-
-        if (mState.mIsHardwareBitmap) {
-            bitmap = bitmap.copy(Bitmap.Config.HARDWARE, false);
-        }
-
-        mState.mLastDrawnBitmap = bitmap;
-        canvas.restore();
-    }
-
-    private static class ShadowDrawableState extends ConstantState {
-        int mChangingConfigurations;
-        int mBaseWidth;
-        int mBaseHeight;
-        float mRotateDegrees;
-        float mTranslationX;
-        float mTranslationY;
-        int mShadowOffsetX;
-        int mShadowOffsetY;
-        int mShadowSize;
-        int mShadowColor;
-
-        boolean mIsHardwareBitmap;
-        Bitmap mLastDrawnBitmap;
-        ConstantState mChildState;
-
-        @Override
-        public Drawable newDrawable() {
-            return new ShadowKeyDrawable(null, this);
-        }
-
-        @Override
-        public int getChangingConfigurations() {
-            return mChangingConfigurations;
-        }
-
-        @Override
-        public boolean canApplyTheme() {
-            return true;
-        }
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index a318e15..22a727c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -2148,6 +2148,22 @@
         mStatusBarKeyguardViewManager.readyForKeyguardDone();
     }
 
+    public void dispatchNotificationsPanelTouchEvent(MotionEvent ev) {
+        if (!panelsEnabled()) {
+            return;
+        }
+        mNotificationPanel.dispatchTouchEvent(ev);
+
+        int action = ev.getAction();
+        if (action == MotionEvent.ACTION_DOWN) {
+            // Start ignoring all touch events coming to status bar window.
+            // TODO: handle case where ACTION_UP is not sent over the binder
+            mStatusBarWindowController.setNotTouchable(true);
+        } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+            mStatusBarWindowController.setNotTouchable(false);
+        }
+    }
+
     @Override
     public void animateExpandNotificationsPanel() {
         if (SPEW) Log.d(TAG, "animateExpand: mExpandedVisible=" + mExpandedVisible);
@@ -4364,6 +4380,7 @@
             }
             mEntryManager.updateNotifications();
             updateDozingState();
+            updateScrimController();
             updateReportRejectedTouchVisibility();
         }
         Trace.endSection();
@@ -4499,8 +4516,8 @@
             if (mDozingRequested) {
                 mDozingRequested = false;
                 DozeLog.traceDozing(mContext, mDozing);
-                mWakefulnessLifecycle.dispatchStartedWakingUp();
                 updateDozing();
+                mWakefulnessLifecycle.dispatchStartedWakingUp();
             }
         }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowController.java
index 46264f9..167bba6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowController.java
@@ -279,6 +279,7 @@
         applyBrightness(state);
         applyHasTopUi(state);
         applySleepToken(state);
+        applyNotTouchable(state);
         if (mLp.copyFrom(mLpChanged) != 0) {
             mWindowManager.updateViewLayout(mStatusBarView, mLp);
         }
@@ -330,6 +331,14 @@
         }
     }
 
+    private void applyNotTouchable(State state) {
+        if (state.notTouchable) {
+            mLpChanged.flags |= LayoutParams.FLAG_NOT_TOUCHABLE;
+        } else {
+            mLpChanged.flags &= ~LayoutParams.FLAG_NOT_TOUCHABLE;
+        }
+    }
+
     public void setKeyguardShowing(boolean showing) {
         mCurrentState.keyguardShowing = showing;
         apply(mCurrentState);
@@ -454,6 +463,11 @@
         apply(mCurrentState);
     }
 
+    public void setNotTouchable(boolean notTouchable) {
+        mCurrentState.notTouchable = notTouchable;
+        apply(mCurrentState);
+    }
+
     public void setStateListener(OtherwisedCollapsedListener listener) {
         mListener = listener;
     }
@@ -501,6 +515,7 @@
         boolean forceUserActivity;
         boolean backdropShowing;
         boolean wallpaperSupportsAmbientMode;
+        boolean notTouchable;
 
         /**
          * The {@link StatusBar} state from the status bar.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/VelocityTrackerFactory.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/VelocityTrackerFactory.java
deleted file mode 100644
index e153b85..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/VelocityTrackerFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.systemui.statusbar.phone;
-
-import android.content.Context;
-
-import com.android.systemui.R;
-
-/**
- * A class to generate {@link VelocityTrackerInterface}, depending on the configuration.
- */
-public class VelocityTrackerFactory {
-
-    public static final String PLATFORM_IMPL = "platform";
-    public static final String NOISY_IMPL = "noisy";
-
-    public static VelocityTrackerInterface obtain(Context ctx) {
-        String tracker = ctx.getResources().getString(R.string.velocity_tracker_impl);
-        switch (tracker) {
-            case NOISY_IMPL:
-                return NoisyVelocityTracker.obtain();
-            case PLATFORM_IMPL:
-                return PlatformVelocityTracker.obtain();
-            default:
-                throw new IllegalStateException("Invalid tracker: " + tracker);
-        }
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/VelocityTrackerInterface.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/VelocityTrackerInterface.java
deleted file mode 100644
index a54b054..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/VelocityTrackerInterface.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.systemui.statusbar.phone;
-
-import android.view.MotionEvent;
-
-/**
- * An interface for a velocity tracker to delegate. To be implemented by different velocity tracking
- * algorithms.
- */
-public interface VelocityTrackerInterface {
-    public void addMovement(MotionEvent event);
-    public void computeCurrentVelocity(int units);
-    public float getXVelocity();
-    public float getYVelocity();
-    public void recycle();
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
index 1085b06..6f64a563 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
@@ -65,7 +65,6 @@
         mLocalBluetoothManager = Dependency.get(LocalBluetoothManager.class);
         mBgHandler = new Handler(bgLooper);
         if (mLocalBluetoothManager != null) {
-            mLocalBluetoothManager.getEventManager().setReceiverHandler(mBgHandler);
             mLocalBluetoothManager.getEventManager().registerCallback(this);
             mLocalBluetoothManager.getProfileManager().addServiceListener(this);
             onBluetoothStateChanged(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java
index 8e31f31..945d9b9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java
@@ -16,23 +16,34 @@
 
 package com.android.systemui.statusbar.policy;
 
-import android.annotation.Nullable;
+import android.animation.ArgbEvaluator;
+import android.annotation.ColorInt;
+import android.annotation.DrawableRes;
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BlurMaskFilter;
+import android.graphics.BlurMaskFilter.Blur;
+import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.Rect;
+import android.graphics.drawable.AnimatedVectorDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
 import android.util.FloatProperty;
-import android.view.Gravity;
-
+import com.android.settingslib.Utils;
 import com.android.systemui.R;
-import com.android.systemui.statusbar.phone.ShadowKeyDrawable;
 
 /**
- * Drawable for {@link KeyButtonView}s which contains an asset for both normal mode and light
- * navigation bar mode.
+ * Drawable for {@link KeyButtonView}s that supports tinting between two colors, rotation and shows
+ * a shadow. AnimatedVectorDrawable will only support tinting from intensities but has no support
+ * for shadows nor rotations.
  */
-public class KeyButtonDrawable extends LayerDrawable {
+public class KeyButtonDrawable extends Drawable {
 
     public static final FloatProperty<KeyButtonDrawable> KEY_DRAWABLE_ROTATE =
         new FloatProperty<KeyButtonDrawable>("KeyButtonRotation") {
@@ -60,83 +71,343 @@
             }
         };
 
-    private final boolean mHasDarkDrawable;
+    private final Paint mIconPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
+    private final Paint mShadowPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
+    private final ShadowDrawableState mState;
+    private AnimatedVectorDrawable mAnimatedDrawable;
 
-    public static KeyButtonDrawable create(Context lightContext, Drawable lightDrawable,
-            @Nullable Drawable darkDrawable, boolean hasShadow) {
-        if (darkDrawable != null) {
-            ShadowKeyDrawable light = new ShadowKeyDrawable(lightDrawable.mutate());
-            ShadowKeyDrawable dark = new ShadowKeyDrawable(darkDrawable.mutate());
-            if (hasShadow) {
-                // Only apply the shadow on the light drawable
-                Resources res = lightContext.getResources();
-                int offsetX = res.getDimensionPixelSize(R.dimen.nav_key_button_shadow_offset_x);
-                int offsetY = res.getDimensionPixelSize(R.dimen.nav_key_button_shadow_offset_y);
-                int radius = res.getDimensionPixelSize(R.dimen.nav_key_button_shadow_radius);
-                int color = lightContext.getColor(R.color.nav_key_button_shadow_color);
-                light.setShadowProperties(offsetX, offsetY, radius, color);
-            }
-            return new KeyButtonDrawable(new Drawable[] { light, dark });
-        } else {
-            return new KeyButtonDrawable(new Drawable[] {
-                    new ShadowKeyDrawable(lightDrawable.mutate()) });
-        }
+    public KeyButtonDrawable(Drawable d, @ColorInt int lightColor, @ColorInt int darkColor) {
+        this(d, new ShadowDrawableState(lightColor, darkColor,
+                d instanceof AnimatedVectorDrawable));
     }
 
-    protected KeyButtonDrawable(Drawable[] drawables) {
-        super(drawables);
-        for (int i = 0; i < drawables.length; i++) {
-            setLayerGravity(i, Gravity.CENTER);
+    private KeyButtonDrawable(Drawable d, ShadowDrawableState state) {
+        mState = state;
+        if (d != null) {
+            mState.mBaseHeight = d.getIntrinsicHeight();
+            mState.mBaseWidth = d.getIntrinsicWidth();
+            mState.mChangingConfigurations = d.getChangingConfigurations();
+            mState.mChildState = d.getConstantState();
         }
-        mutate();
-        mHasDarkDrawable = drawables.length > 1;
-        setDarkIntensity(0f);
+        if (canAnimate()) {
+            mAnimatedDrawable = (AnimatedVectorDrawable) mState.mChildState.newDrawable().mutate();
+            setDrawableBounds(mAnimatedDrawable);
+        }
     }
 
     public void setDarkIntensity(float intensity) {
-        if (!mHasDarkDrawable) {
-            return;
-        }
-        getDrawable(0).setAlpha((int) ((1 - intensity) * 255f));
-        getDrawable(1).setAlpha((int) (intensity * 255f));
-        invalidateSelf();
+        mState.mDarkIntensity = intensity;
+        final int color = (int) ArgbEvaluator.getInstance()
+                .evaluate(intensity, mState.mLightColor, mState.mDarkColor);
+        updateShadowAlpha();
+        setColorFilter(new PorterDuffColorFilter(color, Mode.SRC_ATOP));
     }
 
     public void setRotation(float degrees) {
-        if (getDrawable(0) instanceof ShadowKeyDrawable) {
-            ((ShadowKeyDrawable) getDrawable(0)).setRotation(degrees);
+        if (canAnimate()) {
+            // AnimatedVectorDrawables will not support rotation
+            return;
         }
-        if (mHasDarkDrawable && getDrawable(1) instanceof ShadowKeyDrawable) {
-            ((ShadowKeyDrawable) getDrawable(1)).setRotation(degrees);
+        if (mState.mRotateDegrees != degrees) {
+            mState.mRotateDegrees = degrees;
+            invalidateSelf();
         }
     }
 
+    public void setTranslationX(float x) {
+        setTranslation(x, mState.mTranslationY);
+    }
+
     public void setTranslationY(float y) {
-        if (getDrawable(0) instanceof ShadowKeyDrawable) {
-            ((ShadowKeyDrawable) getDrawable(0)).setTranslationY(y);
+        setTranslation(mState.mTranslationX, y);
+    }
+
+    public void setTranslation(float x, float y) {
+        if (mState.mTranslationX != x || mState.mTranslationY != y) {
+            mState.mTranslationX = x;
+            mState.mTranslationY = y;
+            invalidateSelf();
         }
-        if (mHasDarkDrawable && getDrawable(1) instanceof ShadowKeyDrawable) {
-            ((ShadowKeyDrawable) getDrawable(1)).setTranslationY(y);
+    }
+
+    public void setShadowProperties(int x, int y, int size, int color) {
+        if (canAnimate()) {
+            // AnimatedVectorDrawables will not support shadows
+            return;
         }
+        if (mState.mShadowOffsetX != x || mState.mShadowOffsetY != y
+                || mState.mShadowSize != size || mState.mShadowColor != color) {
+            mState.mShadowOffsetX = x;
+            mState.mShadowOffsetY = y;
+            mState.mShadowSize = size;
+            mState.mShadowColor = color;
+            mShadowPaint.setColorFilter(
+                    new PorterDuffColorFilter(mState.mShadowColor, Mode.SRC_ATOP));
+            updateShadowAlpha();
+            invalidateSelf();
+        }
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        mState.mAlpha = alpha;
+        mIconPaint.setAlpha(alpha);
+        updateShadowAlpha();
+        invalidateSelf();
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter colorFilter) {
+        mIconPaint.setColorFilter(colorFilter);
+        if (mAnimatedDrawable != null) {
+            mAnimatedDrawable.setColorFilter(colorFilter);
+        }
+        invalidateSelf();
+    }
+
+    public float getDarkIntensity() {
+        return mState.mDarkIntensity;
     }
 
     public float getRotation() {
-        if (getDrawable(0) instanceof ShadowKeyDrawable) {
-            return ((ShadowKeyDrawable) getDrawable(0)).getRotation();
-        }
-        if (mHasDarkDrawable && getDrawable(1) instanceof ShadowKeyDrawable) {
-            return ((ShadowKeyDrawable) getDrawable(1)).getRotation();
-        }
-        return 0;
+        return mState.mRotateDegrees;
+    }
+
+    public float getTranslationX() {
+        return mState.mTranslationX;
     }
 
     public float getTranslationY() {
-        if (getDrawable(0) instanceof ShadowKeyDrawable) {
-            return ((ShadowKeyDrawable) getDrawable(0)).getTranslationY();
+        return mState.mTranslationY;
+    }
+
+    @Override
+    public ConstantState getConstantState() {
+        return mState;
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return mState.mBaseHeight + (mState.mShadowSize + Math.abs(mState.mShadowOffsetY)) * 2;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return mState.mBaseWidth + (mState.mShadowSize + Math.abs(mState.mShadowOffsetX)) * 2;
+    }
+
+    public boolean canAnimate() {
+        return mState.mSupportsAnimation;
+    }
+
+    public void startAnimation() {
+        if (mAnimatedDrawable != null) {
+            mAnimatedDrawable.start();
         }
-        if (mHasDarkDrawable && getDrawable(1) instanceof ShadowKeyDrawable) {
-            return ((ShadowKeyDrawable) getDrawable(1)).getTranslationY();
+    }
+
+    public void resetAnimation() {
+        if (mAnimatedDrawable != null) {
+            mAnimatedDrawable.reset();
         }
-        return 0;
+    }
+
+    public void clearAnimationCallbacks() {
+        if (mAnimatedDrawable != null) {
+            mAnimatedDrawable.clearAnimationCallbacks();
+        }
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        Rect bounds = getBounds();
+        if (bounds.isEmpty()) {
+            return;
+        }
+
+        if (mAnimatedDrawable != null) {
+            mAnimatedDrawable.draw(canvas);
+        } else {
+            // If no cache or previous cached bitmap is hardware/software acceleration does not
+            // match the current canvas on draw then regenerate
+            boolean hwBitmapChanged = mState.mIsHardwareBitmap != canvas.isHardwareAccelerated();
+            if (hwBitmapChanged) {
+                mState.mIsHardwareBitmap = canvas.isHardwareAccelerated();
+            }
+            if (mState.mLastDrawnIcon == null || hwBitmapChanged) {
+                regenerateBitmapIconCache();
+            }
+            canvas.save();
+            canvas.translate(mState.mTranslationX, mState.mTranslationY);
+            canvas.rotate(mState.mRotateDegrees, getIntrinsicWidth() / 2, getIntrinsicHeight() / 2);
+
+            if (mState.mShadowSize > 0) {
+                if (mState.mLastDrawnShadow == null || hwBitmapChanged) {
+                    regenerateBitmapShadowCache();
+                }
+
+                // Translate (with rotation offset) before drawing the shadow
+                final float radians = (float) (mState.mRotateDegrees * Math.PI / 180);
+                final float shadowOffsetX = (float) (Math.sin(radians) * mState.mShadowOffsetY
+                        + Math.cos(radians) * mState.mShadowOffsetX) - mState.mTranslationX;
+                final float shadowOffsetY = (float) (Math.cos(radians) * mState.mShadowOffsetY
+                        - Math.sin(radians) * mState.mShadowOffsetX) - mState.mTranslationY;
+                canvas.drawBitmap(mState.mLastDrawnShadow, shadowOffsetX, shadowOffsetY,
+                        mShadowPaint);
+            }
+            canvas.drawBitmap(mState.mLastDrawnIcon, null, bounds, mIconPaint);
+            canvas.restore();
+        }
+    }
+
+    @Override
+    public boolean canApplyTheme() {
+        return mState.canApplyTheme();
+    }
+
+    private void regenerateBitmapIconCache() {
+        final int width = getIntrinsicWidth();
+        final int height = getIntrinsicHeight();
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        final Canvas canvas = new Canvas(bitmap);
+
+        // Call mutate, so that the pixel allocation by the underlying vector drawable is cleared.
+        final Drawable d = mState.mChildState.newDrawable().mutate();
+        setDrawableBounds(d);
+        d.draw(canvas);
+
+        if (mState.mIsHardwareBitmap) {
+            bitmap = bitmap.copy(Bitmap.Config.HARDWARE, false);
+        }
+        mState.mLastDrawnIcon = bitmap;
+    }
+
+    private void regenerateBitmapShadowCache() {
+        if (mState.mShadowSize == 0) {
+            // No shadow
+            mState.mLastDrawnIcon = null;
+            return;
+        }
+
+        final int width = getIntrinsicWidth();
+        final int height = getIntrinsicHeight();
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+
+        // Call mutate, so that the pixel allocation by the underlying vector drawable is cleared.
+        final Drawable d = mState.mChildState.newDrawable().mutate();
+        setDrawableBounds(d);
+        d.draw(canvas);
+
+        // Draws the shadow from original drawable
+        Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
+        paint.setMaskFilter(new BlurMaskFilter(mState.mShadowSize, Blur.NORMAL));
+        int[] offset = new int[2];
+        final Bitmap shadow = bitmap.extractAlpha(paint, offset);
+        paint.setMaskFilter(null);
+        bitmap.eraseColor(Color.TRANSPARENT);
+        canvas.drawBitmap(shadow, offset[0], offset[1], paint);
+
+        if (mState.mIsHardwareBitmap) {
+            bitmap = bitmap.copy(Bitmap.Config.HARDWARE, false);
+        }
+        mState.mLastDrawnShadow = bitmap;
+    }
+
+    /**
+     * Set the alpha of the shadow. As dark intensity increases, drop the alpha of the shadow since
+     * dark color and shadow should not be visible at the same time.
+     */
+    private void updateShadowAlpha() {
+        // Update the color from the original color's alpha as the max
+        int alpha = Color.alpha(mState.mShadowColor);
+        mShadowPaint.setAlpha(
+                Math.round(alpha * (mState.mAlpha / 255f) * (1 - mState.mDarkIntensity)));
+    }
+
+    /**
+     * Prevent shadow clipping by offsetting the drawable bounds by the shadow and its offset
+     * @param d the drawable to set the bounds
+     */
+    private void setDrawableBounds(Drawable d) {
+        final int offsetX = mState.mShadowSize + Math.abs(mState.mShadowOffsetX);
+        final int offsetY = mState.mShadowSize + Math.abs(mState.mShadowOffsetY);
+        d.setBounds(offsetX, offsetY, getIntrinsicWidth() - offsetX,
+                getIntrinsicHeight() - offsetY);
+    }
+
+    private static class ShadowDrawableState extends ConstantState {
+        int mChangingConfigurations;
+        int mBaseWidth;
+        int mBaseHeight;
+        float mRotateDegrees;
+        float mTranslationX;
+        float mTranslationY;
+        int mShadowOffsetX;
+        int mShadowOffsetY;
+        int mShadowSize;
+        int mShadowColor;
+        float mDarkIntensity;
+        int mAlpha;
+
+        boolean mIsHardwareBitmap;
+        Bitmap mLastDrawnIcon;
+        Bitmap mLastDrawnShadow;
+        ConstantState mChildState;
+
+        final int mLightColor;
+        final int mDarkColor;
+        final boolean mSupportsAnimation;
+
+        public ShadowDrawableState(@ColorInt int lightColor, @ColorInt int darkColor,
+                boolean animated) {
+            mLightColor = lightColor;
+            mDarkColor = darkColor;
+            mSupportsAnimation = animated;
+            mAlpha = 255;
+        }
+
+        @Override
+        public Drawable newDrawable() {
+            return new KeyButtonDrawable(null, this);
+        }
+
+        @Override
+        public int getChangingConfigurations() {
+            return mChangingConfigurations;
+        }
+
+        @Override
+        public boolean canApplyTheme() {
+            return true;
+        }
+    }
+
+    public static KeyButtonDrawable create(Context lightContext, Context darkContext,
+        @DrawableRes int iconResId, boolean hasShadow) {
+        return create(lightContext,
+            Utils.getColorAttrDefaultColor(lightContext, R.attr.singleToneColor),
+            Utils.getColorAttrDefaultColor(darkContext, R.attr.singleToneColor),
+            iconResId, hasShadow);
+    }
+
+    public static KeyButtonDrawable create(Context context, @ColorInt int lightColor,
+        @ColorInt int darkColor, @DrawableRes int iconResId, boolean hasShadow) {
+        final KeyButtonDrawable drawable = new KeyButtonDrawable(context.getDrawable(iconResId),
+            lightColor, darkColor);
+        if (hasShadow) {
+            final Resources res = context.getResources();
+            int offsetX = res.getDimensionPixelSize(R.dimen.nav_key_button_shadow_offset_x);
+            int offsetY = res.getDimensionPixelSize(R.dimen.nav_key_button_shadow_offset_y);
+            int radius = res.getDimensionPixelSize(R.dimen.nav_key_button_shadow_radius);
+            int color = context.getColor(R.color.nav_key_button_shadow_color);
+            drawable.setShadowProperties(offsetX, offsetY, radius, color);
+        }
+        return drawable;
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
index a046675..8ca1415 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
@@ -36,6 +36,7 @@
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.cdma.EriInfo;
 import com.android.settingslib.graph.SignalDrawable;
+import com.android.settingslib.Utils;
 import com.android.systemui.R;
 import com.android.systemui.statusbar.policy.NetworkController.IconState;
 import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;
@@ -319,28 +320,6 @@
         return new MobileState();
     }
 
-    private boolean hasService() {
-        if (mServiceState != null) {
-            // Consider the device to be in service if either voice or data
-            // service is available. Some SIM cards are marketed as data-only
-            // and do not support voice service, and on these SIM cards, we
-            // want to show signal bars for data service as well as the "no
-            // service" or "emergency calls only" text that indicates that voice
-            // is not available.
-            switch (mServiceState.getVoiceRegState()) {
-                case ServiceState.STATE_POWER_OFF:
-                    return false;
-                case ServiceState.STATE_OUT_OF_SERVICE:
-                case ServiceState.STATE_EMERGENCY_ONLY:
-                    return mServiceState.getDataRegState() == ServiceState.STATE_IN_SERVICE;
-                default:
-                    return true;
-            }
-        } else {
-            return false;
-        }
-    }
-
     private boolean isCdma() {
         return (mSignalStrength != null) && !mSignalStrength.isGsm();
     }
@@ -446,10 +425,11 @@
      */
     private final void updateTelephony() {
         if (DEBUG) {
-            Log.d(mTag, "updateTelephonySignalStrength: hasService=" + hasService()
-                    + " ss=" + mSignalStrength);
+            Log.d(mTag, "updateTelephonySignalStrength: hasService=" +
+                    Utils.isInService(mServiceState) + " ss=" + mSignalStrength);
         }
-        mCurrentState.connected = hasService() && mSignalStrength != null;
+        mCurrentState.connected = Utils.isInService(mServiceState)
+                && mSignalStrength != null;
         if (mCurrentState.connected) {
             if (!mSignalStrength.isGsm() && mConfig.alwaysShowCdmaRssi) {
                 mCurrentState.level = mSignalStrength.getCdmaLevel();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TintedKeyButtonDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TintedKeyButtonDrawable.java
deleted file mode 100644
index 30a5cc84..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TintedKeyButtonDrawable.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.systemui.statusbar.policy;
-
-import android.annotation.ColorInt;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-
-import com.android.internal.graphics.ColorUtils;
-import com.android.systemui.statusbar.phone.ShadowKeyDrawable;
-
-/**
- * Drawable for {@link KeyButtonView}s which contains a single asset and colors for light and dark
- * navigation bar mode.
- */
-public class TintedKeyButtonDrawable extends KeyButtonDrawable {
-
-    private final int mLightColor;
-    private final int mDarkColor;
-
-    public static final float DARK_INTENSITY_NOT_SET = -1f;
-    private float mDarkIntensity = DARK_INTENSITY_NOT_SET;
-
-    public static TintedKeyButtonDrawable create(Drawable drawable, @ColorInt int lightColor,
-            @ColorInt int darkColor) {
-        return new TintedKeyButtonDrawable(new Drawable[] { drawable },
-                lightColor, darkColor);
-    }
-
-    private TintedKeyButtonDrawable(Drawable[] drawables, int lightColor, int darkColor){
-        super(drawables);
-        mLightColor = lightColor;
-        mDarkColor = darkColor;
-        setDarkIntensity(0f); // Set initial coloration
-    }
-
-    @Override
-    public void setDarkIntensity(float intensity) {
-        // Duplicate intensity scaling from KeyButtonDrawable
-        mDarkIntensity = intensity;
-
-        // Dark and light colors may have an alpha component
-        final int intermediateColor = ColorUtils.compositeColors(
-                blendAlpha(mDarkColor, intensity),
-                blendAlpha(mLightColor, (1f - intensity)));
-
-        getDrawable(0).setTint(intermediateColor);
-        invalidateSelf();
-    }
-
-    private int blendAlpha(int color, float alpha) {
-        final float newAlpha = alpha < 0f ? 0f : (alpha > 1f ? 1f : alpha);
-        final float colorAlpha = Color.alpha(color) / 255f;
-        final int alphaInt = (int) (255 * newAlpha * colorAlpha); // Blend by multiplying
-        // Ensure alpha is clamped [0-255] or ColorUtils will crash
-        return ColorUtils.setAlphaComponent(color, alphaInt);
-    }
-
-    public boolean isDarkIntensitySet() {
-        return mDarkIntensity != DARK_INTENSITY_NOT_SET;
-    }
-
-    public float getDarkIntensity() {
-        return mDarkIntensity;
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
index 13fabfd..dbfbdd7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -18,12 +18,8 @@
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
-import android.R.attr;
 import android.app.ActivityManager;
 import android.app.Dialog;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -49,24 +45,21 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.util.UserIcons;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.Utils;
 import com.android.systemui.Dependency;
 import com.android.systemui.GuestResumeSessionReceiver;
 import com.android.systemui.Prefs;
 import com.android.systemui.Prefs.Key;
 import com.android.systemui.R;
-import com.android.systemui.SystemUI;
 import com.android.systemui.SystemUISecondaryUserService;
+import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.plugins.qs.DetailAdapter;
 import com.android.systemui.qs.tiles.UserDetailView;
-import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.statusbar.phone.SystemUIDialog;
-import com.android.systemui.util.NotificationChannels;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -690,9 +683,9 @@
     }
 
     private void checkIfAddUserDisallowedByAdminOnly(UserRecord record) {
-        EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
+        EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,
                 UserManager.DISALLOW_ADD_USER, ActivityManager.getCurrentUser());
-        if (admin != null && !RestrictedLockUtils.hasBaseUserRestriction(mContext,
+        if (admin != null && !RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
                 UserManager.DISALLOW_ADD_USER, ActivityManager.getCurrentUser())) {
             record.isDisabledByAdmin = true;
             record.enforcedAdmin = admin;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/ImageWallpaperTest.java b/packages/SystemUI/tests/src/com/android/systemui/ImageWallpaperTest.java
new file mode 100644
index 0000000..521d5d1
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/ImageWallpaperTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui;
+
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+import android.graphics.Bitmap;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.view.DisplayInfo;
+import android.view.SurfaceHolder;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.concurrent.CountDownLatch;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ImageWallpaperTest extends SysuiTestCase {
+
+    private static final int BMP_WIDTH = 128;
+    private static final int BMP_HEIGHT = 128;
+
+    private static final int INVALID_BMP_WIDTH = 1;
+    private static final int INVALID_BMP_HEIGHT = 1;
+
+    private ImageWallpaper mImageWallpaper;
+
+    @Mock private SurfaceHolder mSurfaceHolder;
+    @Mock private DisplayInfo mDisplayInfo;
+
+    CountDownLatch mEventCountdown;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        mEventCountdown = new CountDownLatch(1);
+
+        mImageWallpaper = new ImageWallpaper() {
+            @Override
+            public Engine onCreateEngine() {
+                return new DrawableEngine() {
+                    @Override
+                    DisplayInfo getDefaultDisplayInfo() {
+                        return mDisplayInfo;
+                    }
+
+                    @Override
+                    public SurfaceHolder getSurfaceHolder() {
+                        return mSurfaceHolder;
+                    }
+
+                    @Override
+                    public void setFixedSizeAllowed(boolean allowed) {
+                        super.setFixedSizeAllowed(allowed);
+                        assertTrue("mFixedSizeAllowed should be true", allowed);
+                        mEventCountdown.countDown();
+                    }
+                };
+            }
+        };
+    }
+
+    @Test
+    public void testSetValidBitmapWallpaper() {
+        ImageWallpaper.DrawableEngine wallpaperEngine =
+                (ImageWallpaper.DrawableEngine) mImageWallpaper.onCreateEngine();
+
+        assertEquals("setFixedSizeAllowed should have been called.",
+                0, mEventCountdown.getCount());
+
+        Bitmap mockedBitmap = mock(Bitmap.class);
+        when(mockedBitmap.getWidth()).thenReturn(BMP_WIDTH);
+        when(mockedBitmap.getHeight()).thenReturn(BMP_HEIGHT);
+
+        wallpaperEngine.updateBitmap(mockedBitmap);
+
+        assertEquals(BMP_WIDTH, wallpaperEngine.mBackgroundWidth);
+        assertEquals(BMP_HEIGHT, wallpaperEngine.mBackgroundHeight);
+
+        verify(mSurfaceHolder, times(1)).setFixedSize(BMP_WIDTH, BMP_HEIGHT);
+
+    }
+
+    @Test
+    public void testSetTooSmallBitmapWallpaper() {
+        ImageWallpaper.DrawableEngine wallpaperEngine =
+                (ImageWallpaper.DrawableEngine) mImageWallpaper.onCreateEngine();
+
+        assertEquals("setFixedSizeAllowed should have been called.",
+                0, mEventCountdown.getCount());
+
+        Bitmap mockedBitmap = mock(Bitmap.class);
+        when(mockedBitmap.getWidth()).thenReturn(INVALID_BMP_WIDTH);
+        when(mockedBitmap.getHeight()).thenReturn(INVALID_BMP_HEIGHT);
+
+        wallpaperEngine.updateBitmap(mockedBitmap);
+
+        assertEquals(INVALID_BMP_WIDTH, wallpaperEngine.mBackgroundWidth);
+        assertEquals(INVALID_BMP_HEIGHT, wallpaperEngine.mBackgroundHeight);
+
+        verify(mSurfaceHolder, times(1)).setFixedSize(ImageWallpaper.DrawableEngine.MIN_BACKGROUND_WIDTH, ImageWallpaper.DrawableEngine.MIN_BACKGROUND_HEIGHT);
+    }
+
+}
diff --git a/packages/SystemUI/tools/lint/README b/packages/SystemUI/tools/lint/README
new file mode 100644
index 0000000..0745196
--- /dev/null
+++ b/packages/SystemUI/tools/lint/README
@@ -0,0 +1,26 @@
+This directory contains configuration files for lint, which is run
+in as an upload hook for repo upload.
+
+lint.xml contains checks that are turned on or off, or whitelisted /
+blacklisted for particular directories, if they are different from
+the default.
+
+baseline.xml contains the list of existing "grandfathered" lint
+errors in the codebase. It is generated using ./tools/lint/update_baseline.sh
+
+When you hit a lint error that should not be triggered, there are 3
+possible resolutions:
+1. Use tools:ignore or @SuppressLint annotation. This is preferred
+   for cases where the lint violation is intended, so that reviewers
+   can review whether the suppression is appropriate.
+2. Use tools/lint.xml to ignore a lint check which we don't care
+   about for any file, or checks that are not actionable by the
+   CL author (e.g. translation issues)
+3. If there are lint errors that should be fixed, but cannot be done
+   immediately for some reason, the issue should be added to
+   baseline.xml.
+
+
+References
+- https://developer.android.com/studio/write/lint.html
+- http://tools.android.com/tips/lint-checks
diff --git a/packages/SystemUI/tools/lint/baseline.xml b/packages/SystemUI/tools/lint/baseline.xml
new file mode 100644
index 0000000..8c43222
--- /dev/null
+++ b/packages/SystemUI/tools/lint/baseline.xml
@@ -0,0 +1,89874 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="4">
+
+    <issue
+        id="LintError"
+        message="No `.class` files were found in project &quot;.&quot;, so none of the classfile based checks could be run. Does the project need to be built first?">
+        <location
+            file="."/>
+    </issue>
+
+    <issue
+        id="StopShip"
+        message="`STOPSHIP` comment found; points to code which must be fixed prior to release"
+        errorLine1="    &lt;!-- STOPSHIP Monitoring strings still need to be finalized and approved -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1152"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="DuplicateIds"
+        message="Duplicate id `@+id/wifi_combo`, already defined earlier in this layout"
+        errorLine1="            android:id=&quot;@+id/wifi_combo&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar_wifi_group.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/layout/status_bar_wifi_group.xml"
+            line="22"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="CutPasteId"
+        message="The id `R.id.tuner_zen_switch` has already been looked up in this method; possible cut &amp; paste error?"
+        errorLine1="        ViewGroup detail_header = findViewById(R.id.tuner_zen_switch);"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/com/android/systemui/tuner/TunerZenModePanel.java"
+            line="71"
+            column="35"/>
+        <location
+            file="src/com/android/systemui/tuner/TunerZenModePanel.java"
+            line="56"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="DuplicateIncludedIds"
+        message="Duplicate id @+id/center_group, defined or included multiple times in layout/nav_bar_tuner_inflater.xml: [layout/nav_bar_tuner_inflater.xml => layout/navigation_layout.xml defines @+id/center_group, layout/nav_bar_tuner_inflater.xml => layout/navigation_layout_rot90.xml defines @+id/center_group]"
+        errorLine1="    &lt;include android:id=&quot;@+id/rot90&quot; layout=&quot;@layout/navigation_layout_rot90&quot; />"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nav_bar_tuner_inflater.xml"
+            line="25"
+            column="5"/>
+        <location
+            file="res/layout/navigation_layout.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/layout/navigation_layout_rot90.xml"
+            line="43"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="DuplicateIncludedIds"
+        message="Duplicate id @+id/ends_group, defined or included multiple times in layout/nav_bar_tuner_inflater.xml: [layout/nav_bar_tuner_inflater.xml => layout/navigation_layout.xml defines @+id/ends_group, layout/nav_bar_tuner_inflater.xml => layout/navigation_layout_rot90.xml defines @+id/ends_group]"
+        errorLine1="    &lt;include android:id=&quot;@+id/rot90&quot; layout=&quot;@layout/navigation_layout_rot90&quot; />"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nav_bar_tuner_inflater.xml"
+            line="25"
+            column="5"/>
+        <location
+            file="res/layout/navigation_layout.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/layout/navigation_layout_rot90.xml"
+            line="35"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="DuplicateIncludedIds"
+        message="Duplicate id @+id/nav_buttons, defined or included multiple times in layout/nav_bar_tuner_inflater.xml: [layout/nav_bar_tuner_inflater.xml => layout/navigation_layout.xml defines @+id/nav_buttons, layout/nav_bar_tuner_inflater.xml => layout/navigation_layout_rot90.xml defines @+id/nav_buttons]"
+        errorLine1="    &lt;include android:id=&quot;@+id/rot90&quot; layout=&quot;@layout/navigation_layout_rot90&quot; />"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nav_bar_tuner_inflater.xml"
+            line="25"
+            column="5"/>
+        <location
+            file="res/layout/navigation_layout.xml"
+            line="28"
+            column="9"/>
+        <location
+            file="res/layout/navigation_layout_rot90.xml"
+            line="28"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="DuplicateIncludedIds"
+        message="Duplicate id @+id/qs_detail_header_progress, defined or included multiple times in layout/qs_panel.xml: [layout/qs_panel.xml => layout/qs_detail.xml defines @+id/qs_detail_header_progress, layout/qs_panel.xml => layout/quick_status_bar_expanded_header.xml defines @+id/qs_detail_header_progress]"
+        errorLine1="    &lt;include android:id=&quot;@+id/qs_detail&quot; layout=&quot;@layout/qs_detail&quot; />"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_panel.xml"
+            line="68"
+            column="5"/>
+        <location
+            file="res/layout/qs_detail.xml"
+            line="37"
+            column="9"/>
+        <location
+            file="res/layout/quick_status_bar_expanded_header.xml"
+            line="58"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="MissingPrefix"
+        message="Unexpected namespace prefix &quot;xmlns&quot; found for tag `LinearLayout`"
+        errorLine1="        xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_facet_button.xml"
+            line="22"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="MissingPrefix"
+        message="Unexpected namespace prefix &quot;xmlns&quot; found for tag `RelativeLayout`"
+        errorLine1="        xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_qs_panel.xml"
+            line="31"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="MissingPrefix"
+        message="Unexpected namespace prefix &quot;xmlns&quot; found for tag `RelativeLayout`"
+        errorLine1="        xmlns:app=&quot;http://schemas.android.com/apk/res-auto&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_qs_panel.xml"
+            line="32"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SdCardPath"
+        message="Do not hardcode &quot;/sdcard/&quot;; use `Environment.getExternalStorageDirectory().getPath()` instead"
+        errorLine1="        ? new GestureRecorder(&quot;/sdcard/statusbar_gestures.dat&quot;)"
+        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/com/android/systemui/statusbar/phone/StatusBar.java"
+            line="407"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="Suspicious0dp"
+        message="Suspicious size: this will make the view invisible, should be used with `layout_weight`"
+        errorLine1="            android:layout_height=&quot;0dp&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_tile_label.xml"
+            line="37"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="IncludeLayoutParam"
+        message="Layout parameter `layout_alignParentTop` ignored unless both `layout_width` and `layout_height` are also specified on `&lt;include>` tag"
+        errorLine1="            android:layout_alignParentTop=&quot;true&quot;/>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_fullscreen_user_switcher.xml"
+            line="34"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="ExtraText"
+        message="Unexpected text found in layout file: &quot;&quot;>&quot;"
+        errorLine1="        android:alpha=&quot;0&quot;/>&quot;>"
+        errorLine2="                           ^">
+        <location
+            file="res/layout/docked_stack_divider.xml"
+            line="30"
+            column="28"/>
+    </issue>
+
+    <issue
+        id="ExtraText"
+        message="Unexpected text found in layout file: &quot;->&quot;"
+        errorLine1="&lt;merge xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>->"
+        errorLine2="                                                                  ^">
+        <location
+            file="res/layout/qs_customize_panel_content.xml"
+            line="18"
+            column="67"/>
+    </issue>
+
+    <issue
+        id="SpUsage"
+        message="Should use &quot;`sp`&quot; instead of &quot;`dp`&quot; for text sizes"
+        errorLine1="                android:textSize=&quot;40dp&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/mland.xml"
+            line="60"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="SpUsage"
+        message="Should use &quot;`sp`&quot; instead of &quot;`dp`&quot; for text sizes"
+        errorLine1="        android:textSize=&quot;11dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/quick_status_bar_expanded_header.xml"
+            line="74"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SpUsage"
+        message="Should use &quot;`sp`&quot; instead of &quot;`dp`&quot; for text sizes"
+        errorLine1="        android:textSize=&quot;20dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar_no_recent_apps.xml"
+            line="29"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="            android:singleLine=&quot;true&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/app_ops_info.xml"
+            line="52"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/battery_percentage_view.xml"
+            line="24"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_fullscreen_user_pod.xml"
+            line="41"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="            android:singleLine=&quot;true&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_left_navigation_bar.xml"
+            line="86"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="            android:singleLine=&quot;true&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_navigation_bar.xml"
+            line="84"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="            android:singleLine=&quot;true&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_right_navigation_bar.xml"
+            line="88"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_status_bar_header.xml"
+            line="38"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_top_navigation_bar.xml"
+            line="31"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/emergency_cryptkeeper_text.xml"
+            line="25"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="                android:singleLine=&quot;true&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/fingerprint_dialog.xml"
+            line="63"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="                android:singleLine=&quot;true&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/fingerprint_dialog.xml"
+            line="78"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/foreground_service_item.xml"
+            line="43"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/foreground_service_title.xml"
+            line="28"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/heads_up_status_bar_layout.xml"
+            line="39"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/hybrid_notification.xml"
+            line="28"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/hybrid_notification.xml"
+            line="35"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="    android:singleLine=&quot;true&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/hybrid_overflow_number.xml"
+            line="25"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: False is the default, so just remove the attribute"
+        errorLine1="            android:singleLine=&quot;false&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/keyboard_shortcut_app_item.xml"
+            line="45"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="          android:singleLine=&quot;true&quot;"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/keyboard_shortcuts_key_view.xml"
+            line="24"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/keyguard_status_bar.xml"
+            line="76"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="            android:singleLine=&quot;true&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/notification_info.xml"
+            line="51"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot; />"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/operator_name.xml"
+            line="30"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="                android:singleLine=&quot;true&quot; />"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_footer_impl.xml"
+            line="68"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_tile_label.xml"
+            line="78"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/quick_qs_status_icons.xml"
+            line="37"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/quick_status_bar_header_system_icons.xml"
+            line="38"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/recents_task_view_header.xml"
+            line="43"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/recents_task_view_header_overlay.xml"
+            line="40"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="            android:singleLine=&quot;true&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/remote_input.xml"
+            line="42"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/split_clock_view.xml"
+            line="28"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/split_clock_view.xml"
+            line="37"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/split_clock_view.xml"
+            line="50"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="                    android:singleLine=&quot;true&quot;"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar.xml"
+            line="78"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="Deprecated"
+        message="`android:singleLine` is deprecated: Use `maxLines=&quot;1&quot;` instead"
+        errorLine1="        android:singleLine=&quot;true&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar_alarm_group.xml"
+            line="32"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Orientation"
+        message="No orientation specified, and the default is horizontal. This is a common source of bugs when children are added dynamically."
+        errorLine1="    &lt;LinearLayout"
+        errorLine2="    ^">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="112"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_left_70`; missing conversion character in &apos;`% a`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_left_70&quot; msgid=&quot;3612060638991687254&quot;>&quot;Gawing 70% ang nasa kaliwa&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-tl/strings.xml"
+            line="754"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_left_70`; missing conversion character in &apos;`% n`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_left_70&quot; msgid=&quot;3612060638991687254&quot;>&quot;70% no ecrã esquerdo&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="754"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_left_50`; missing conversion character in &apos;`% a`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_left_50&quot; msgid=&quot;1248083470322193075&quot;>&quot;Gawing 50% ang nasa kaliwa&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-tl/strings.xml"
+            line="755"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_left_50`; missing conversion character in &apos;`% n`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_left_50&quot; msgid=&quot;1248083470322193075&quot;>&quot;50% no ecrã esquerdo&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="755"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_left_30`; missing conversion character in &apos;`% a`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_left_30&quot; msgid=&quot;543324403127069386&quot;>&quot;Gawing 30% ang nasa kaliwa&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-tl/strings.xml"
+            line="756"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_left_30`; missing conversion character in &apos;`% n`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_left_30&quot; msgid=&quot;543324403127069386&quot;>&quot;30% no ecrã esquerdo&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="756"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_70`; missing conversion character in &apos;`% a`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_70&quot; msgid=&quot;5090779195650364522&quot;>&quot;Gawing 70% ang nasa itaas&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-tl/strings.xml"
+            line="759"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_70`; missing conversion character in &apos;`% n`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_70&quot; msgid=&quot;5090779195650364522&quot;>&quot;70% no ecrã superior&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="759"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_50`; missing conversion character in &apos;`% a`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_50&quot; msgid=&quot;6385859741925078668&quot;>&quot;Gawing 50% ang nasa itaas&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-tl/strings.xml"
+            line="760"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_50`; missing conversion character in &apos;`% n`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_50&quot; msgid=&quot;6385859741925078668&quot;>&quot;50% no ecrã superior&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="760"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_30`; missing conversion character in &apos;`% a`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_30&quot; msgid=&quot;6201455163864841205&quot;>&quot;Gawing 30% ang nasa itaas&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-tl/strings.xml"
+            line="761"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_30`; missing conversion character in &apos;`% n`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_30&quot; msgid=&quot;6201455163864841205&quot;>&quot;30% no ecrã superior&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="761"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_70`; missing conversion character in &apos;`% a`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_70&quot; msgid=&quot;5090779195650364522&quot;>&quot;70 % arriba&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-gl/strings.xml"
+            line="761"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_50`; missing conversion character in &apos;`% a`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_50&quot; msgid=&quot;6385859741925078668&quot;>&quot;50 % arriba&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-gl/strings.xml"
+            line="762"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_30`; missing conversion character in &apos;`% a`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_30&quot; msgid=&quot;6201455163864841205&quot;>&quot;30 % arriba&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-gl/strings.xml"
+            line="763"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_70`; missing conversion character in &apos;`% g`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_70&quot; msgid=&quot;5090779195650364522&quot;>&quot;70% górnej części ekranu&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-pl/strings.xml"
+            line="769"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_50`; missing conversion character in &apos;`% g`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_50&quot; msgid=&quot;6385859741925078668&quot;>&quot;50% górnej części ekranu&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-pl/strings.xml"
+            line="770"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_30`; missing conversion character in &apos;`% g`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_30&quot; msgid=&quot;6201455163864841205&quot;>&quot;30% górnej części ekranu&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-pl/strings.xml"
+            line="771"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_70`; missing conversion character in &apos;`% n`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_70&quot; msgid=&quot;5090779195650364522&quot;>&quot;70 % nahoře&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-cs/strings.xml"
+            line="771"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_50`; missing conversion character in &apos;`% n`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_50&quot; msgid=&quot;6385859741925078668&quot;>&quot;50 % nahoře&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-cs/strings.xml"
+            line="772"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatInvalid"
+        message="Incorrect formatting string `accessibility_action_divider_top_30`; missing conversion character in &apos;`% n`&apos; ?"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_30&quot; msgid=&quot;6201455163864841205&quot;>&quot;30 % nahoře&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-cs/strings.xml"
+            line="773"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatMatches"
+        message="Inconsistent formatting types for argument #1 in format string `accessibility_action_divider_top_70` (&apos;% 70e&apos;): Found both &apos;`o`&apos; and &apos;`e`&apos; (in values-de/strings.xml)"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_70&quot; msgid=&quot;5090779195650364522&quot;>&quot;Ezarri goialdea % 70en&quot;&lt;/string>"
+        errorLine2="                                                                                                    ~~~~~">
+        <location
+            file="res/values-eu/strings.xml"
+            line="761"
+            column="101"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="763"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatMatches"
+        message="Inconsistent formatting types for argument #1 in format string `accessibility_action_divider_top_50` (&apos;% 50e&apos;): Found both &apos;`o`&apos; and &apos;`e`&apos; (in values-de/strings.xml)"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_50&quot; msgid=&quot;6385859741925078668&quot;>&quot;Ezarri goialdea % 50en&quot;&lt;/string>"
+        errorLine2="                                                                                                    ~~~~~">
+        <location
+            file="res/values-eu/strings.xml"
+            line="762"
+            column="101"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="764"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="StringFormatMatches"
+        message="Inconsistent formatting types for argument #1 in format string `accessibility_action_divider_top_30` (&apos;% 30e&apos;): Found both &apos;`o`&apos; and &apos;`e`&apos; (in values-de/strings.xml)"
+        errorLine1="    &lt;string name=&quot;accessibility_action_divider_top_30&quot; msgid=&quot;6201455163864841205&quot;>&quot;Ezarri goialdea % 30en&quot;&lt;/string>"
+        errorLine2="                                                                                                    ~~~~~">
+        <location
+            file="res/values-eu/strings.xml"
+            line="763"
+            column="101"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="765"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;per&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level&quot; msgid=&quot;7451474187113371965&quot;>&quot;Battery &lt;xliff:g id=&quot;NUMBER&quot;>%d&lt;/xliff:g> per cent.&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="174"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;per&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level&quot; msgid=&quot;7451474187113371965&quot;>&quot;Battery &lt;xliff:g id=&quot;NUMBER&quot;>%d&lt;/xliff:g> per cent.&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="174"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;per&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level&quot; msgid=&quot;7451474187113371965&quot;>&quot;Battery &lt;xliff:g id=&quot;NUMBER&quot;>%d&lt;/xliff:g> per cent.&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="174"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;per&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level&quot; msgid=&quot;7451474187113371965&quot;>&quot;Battery &lt;xliff:g id=&quot;NUMBER&quot;>%d&lt;/xliff:g> per cent.&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="174"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;percent&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level_charging&quot; msgid=&quot;1147587904439319646&quot;>&quot;Battery charging, &lt;xliff:g id=&quot;BATTERY_PERCENTAGE&quot;>%d&lt;/xliff:g> percent.&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="175"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;percent&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level_charging&quot; msgid=&quot;1147587904439319646&quot;>&quot;Battery charging, &lt;xliff:g id=&quot;BATTERY_PERCENTAGE&quot;>%d&lt;/xliff:g> percent.&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="175"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;percent&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level_charging&quot; msgid=&quot;1147587904439319646&quot;>&quot;Battery charging, &lt;xliff:g id=&quot;BATTERY_PERCENTAGE&quot;>%d&lt;/xliff:g> percent.&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="175"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;percent&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level_charging&quot; msgid=&quot;1147587904439319646&quot;>&quot;Battery charging, &lt;xliff:g id=&quot;BATTERY_PERCENTAGE&quot;>%d&lt;/xliff:g> percent.&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="175"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;Devices&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;quick_settings_bluetooth_multiple_devices_label&quot; msgid=&quot;3912245565613684735&quot;>&quot;Bluetooth (&lt;xliff:g id=&quot;NUMBER&quot;>%d&lt;/xliff:g> Devices)&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="282"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;Devices&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;quick_settings_bluetooth_multiple_devices_label&quot; msgid=&quot;3912245565613684735&quot;>&quot;Bluetooth (&lt;xliff:g id=&quot;NUMBER&quot;>%d&lt;/xliff:g> Devices)&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="282"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;Devices&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;quick_settings_bluetooth_multiple_devices_label&quot; msgid=&quot;3912245565613684735&quot;>&quot;Bluetooth (&lt;xliff:g id=&quot;NUMBER&quot;>%d&lt;/xliff:g> Devices)&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="282"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;Devices&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;quick_settings_bluetooth_multiple_devices_label&quot; msgid=&quot;3912245565613684735&quot;>&quot;Bluetooth (&lt;xliff:g id=&quot;NUMBER&quot;>%d&lt;/xliff:g> Devices)&quot;&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="282"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;percent&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level&quot;>Battery &lt;xliff:g id=&quot;number&quot;>%d&lt;/xliff:g> percent.&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="436"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;percent&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_level_charging&quot;>Battery charging, &lt;xliff:g id=&quot;battery_percentage&quot;>%d&lt;/xliff:g> percent.&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="439"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="PluralsCandidate"
+        message="Formatting %d followed by words (&quot;Devices&quot;): This should probably be a plural rather than a string"
+        errorLine1="    &lt;string name=&quot;quick_settings_bluetooth_multiple_devices_label&quot;>Bluetooth (&lt;xliff:g id=&quot;number&quot;>%d&lt;/xliff:g> Devices)&lt;/string>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="683"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ExportedContentProvider"
+        message="Exported content providers can provide access to potentially sensitive data"
+        errorLine1="        &lt;provider android:name=&quot;.keyguard.KeyguardSliceProvider&quot;"
+        errorLine2="        ^">
+        <location
+            file="AndroidManifest.xml"
+            line="605"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ExportedReceiver"
+        message="Exported receiver does not require permission"
+        errorLine1="        &lt;receiver"
+        errorLine2="        ^">
+        <location
+            file="AndroidManifest.xml"
+            line="611"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ExportedService"
+        message="Exported service does not require permission"
+        errorLine1="        &lt;service android:name=&quot;SystemUIService&quot;"
+        errorLine2="        ^">
+        <location
+            file="AndroidManifest.xml"
+            line="242"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ExportedService"
+        message="Exported service does not require permission"
+        errorLine1="        &lt;service"
+        errorLine2="        ^">
+        <location
+            file="AndroidManifest.xml"
+            line="516"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="DrawAllocation"
+        message="Avoid object allocations during draw/layout operations (preallocate and reuse instead)"
+        errorLine1="            mWindowManagerProxy.setTouchRegion(new Rect(mHandle.getLeft(), mHandle.getTop(),"
+        errorLine2="                                               ^">
+        <location
+            file="src/com/android/systemui/stackdivider/DividerView.java"
+            line="362"
+            column="48"/>
+    </issue>
+
+    <issue
+        id="DrawAllocation"
+        message="Avoid object allocations during draw/layout operations (preallocate and reuse instead)"
+        errorLine1="        mLayoutAlgorithm.getTaskStackBounds(mDisplayRect, new Rect(0, 0, width, height),"
+        errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/com/android/systemui/recents/views/TaskStackView.java"
+            line="1193"
+            column="59"/>
+    </issue>
+
+    <issue
+        id="ObsoleteLayoutParam"
+        message="Invalid layout param in a `LinearLayout`: `layout_alignParentTop`"
+        errorLine1="            android:layout_alignParentTop=&quot;true&quot;/>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_fullscreen_user_switcher.xml"
+            line="34"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="ObsoleteLayoutParam"
+        message="Invalid layout param in a `FrameLayout`: `layout_weight`"
+        errorLine1="        android:layout_weight=&quot;0&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/contextual.xml"
+            line="31"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ObsoleteLayoutParam"
+        message="Invalid layout param in a `FrameLayout`: `layout_weight`"
+        errorLine1="        android:layout_weight=&quot;0&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/contextual.xml"
+            line="44"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ObsoleteLayoutParam"
+        message="Invalid layout param in a `FrameLayout`: `layout_weight`"
+        errorLine1="        android:layout_weight=&quot;0&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/contextual.xml"
+            line="55"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ObsoleteLayoutParam"
+        message="Invalid layout param in a `FrameLayout`: `layout_weight`"
+        errorLine1="        android:layout_weight=&quot;0&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/contextual.xml"
+            line="66"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="UseCompoundDrawables"
+        message="This tag and its children can be replaced by one `&lt;TextView/>` and a compound drawable"
+        errorLine1="&lt;LinearLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/car_fullscreen_user_pod.xml"
+            line="19"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UseCompoundDrawables"
+        message="This tag and its children can be replaced by one `&lt;TextView/>` and a compound drawable"
+        errorLine1="    &lt;LinearLayout"
+        errorLine2="    ^">
+        <location
+            file="res/layout/qs_detail_items.xml"
+            line="34"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="MergeRootFrame"
+        message="This `&lt;FrameLayout>` can be replaced with a `&lt;merge>` tag"
+        errorLine1="&lt;FrameLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/layout/forced_resizable_activity.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="MergeRootFrame"
+        message="This `&lt;FrameLayout>` can be replaced with a `&lt;merge>` tag"
+        errorLine1="&lt;FrameLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/layout/mland.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="MergeRootFrame"
+        message="This `&lt;FrameLayout>` can be replaced with a `&lt;merge>` tag"
+        errorLine1="&lt;FrameLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/navigation_layout.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="MergeRootFrame"
+        message="This `&lt;FrameLayout>` can be replaced with a `&lt;merge>` tag"
+        errorLine1="&lt;FrameLayout"
+        errorLine2="^">
+        <location
+            file="res/layout-sw600dp/navigation_layout_rot90.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="MergeRootFrame"
+        message="This `&lt;FrameLayout>` can be replaced with a `&lt;merge>` tag"
+        errorLine1="&lt;FrameLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/pip_menu_activity.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="MergeRootFrame"
+        message="This `&lt;FrameLayout>` can be replaced with a `&lt;merge>` tag"
+        errorLine1="&lt;FrameLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/layout/quick_settings_header_info.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="MergeRootFrame"
+        message="This `&lt;FrameLayout>` can be replaced with a `&lt;merge>` tag"
+        errorLine1="&lt;FrameLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/recents.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="MergeRootFrame"
+        message="This `&lt;FrameLayout>` can be replaced with a `&lt;merge>` tag"
+        errorLine1="&lt;FrameLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/volume_dnd_icon.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="InefficientWeight"
+        message="Use a `layout_height` of `0dp` instead of `wrap_content` for better performance"
+        errorLine1="                android:layout_height=&quot;wrap_content&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/notification_info.xml"
+            line="109"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="InefficientWeight"
+        message="Use a `layout_width` of `0dp` instead of `wrap_content` for better performance"
+        errorLine1="        android:layout_width=&quot;wrap_content&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/quick_settings_footer.xml"
+            line="30"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="NestedWeights"
+        message="Nested weights are bad for performance"
+        errorLine1="                android:layout_weight=&quot;1&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_footer_impl.xml"
+            line="62"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@color/notification_guts_bg_color` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="        android:background=&quot;@color/notification_guts_bg_color&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/app_ops_info.xml"
+            line="29"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@color/car_user_switcher_background_color` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="        android:background=&quot;@color/car_user_switcher_background_color&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_fullscreen_user_switcher.xml"
+            line="22"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/system_bar_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/system_bar_background&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_left_navigation_bar.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/system_bar_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/system_bar_background&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_left_navigation_bar_unprovisioned.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/system_bar_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/system_bar_background&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_navigation_bar.xml"
+            line="25"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/system_bar_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/system_bar_background&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_navigation_bar_unprovisioned.xml"
+            line="25"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@color/car_qs_background_primary` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@color/car_qs_background_primary&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_qs_panel.xml"
+            line="22"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/system_bar_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/system_bar_background&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_right_navigation_bar.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/system_bar_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/system_bar_background&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_right_navigation_bar_unprovisioned.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/system_bar_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/system_bar_background&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_top_navigation_bar.xml"
+            line="24"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/car_card_rounded_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/car_card_rounded_background&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_volume_dialog.xml"
+            line="19"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/colorForeground` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/colorForeground&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/divider.xml"
+            line="20"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@color/fingerprint_dialog_dim_color` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@color/fingerprint_dialog_dim_color&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/fingerprint_dialog.xml"
+            line="22"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `#4dffffff` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;#4dffffff&quot; />"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/horizontal_divider.xml"
+            line="25"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/dividerHorizontal` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/dividerHorizontal&quot; />"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/keyboard_shortcuts_category_separator.xml"
+            line="25"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@android:color/black` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@android:color/black&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nav_bar_tuner_inflater.xml"
+            line="19"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/system_bar_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/system_bar_background&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/navigation_bar.xml"
+            line="25"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@color/notification_divider_color` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@color/notification_divider_color&quot; />"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/notification_children_divider.xml"
+            line="23"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@color/notification_guts_bg_color` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@color/notification_guts_bg_color&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/notification_info.xml"
+            line="27"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@color/notification_guts_bg_color` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@color/notification_guts_bg_color&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/notification_snooze.xml"
+            line="24"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:selectableItemBackgroundBorderless` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:selectableItemBackgroundBorderless&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/pip_menu_action.xml"
+            line="21"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/listDivider` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/listDivider&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_customize_tile_divider.xml"
+            line="24"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/colorForeground` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/colorForeground&quot; />"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_divider.xml"
+            line="20"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/colorPrimary` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/colorPrimary&quot; >"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/quick_settings_footer.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `#88000000` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;#88000000&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/recents_incompatible_app_overlay.xml"
+            line="21"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/search_bg_transparent` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/search_bg_transparent&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/recents_search_bar.xml"
+            line="20"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/colorAccent` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/colorAccent&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="31"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/colorAccent` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/colorAccent&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="28"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/colorAccent` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/colorAccent&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="28"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/colorAccent` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/colorAccent&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_text_area.xml"
+            line="23"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@drawable/system_bar_background` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;@drawable/system_bar_background&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar.xml"
+            line="27"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/selectableItemBackground` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;?android:attr/selectableItemBackground&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar_alarm_group.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `#CC000000` with a theme that also paints a background (inferred theme is `@style/Theme.SystemUI`)"
+        errorLine1="    android:background=&quot;#CC000000&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/tv_pip_menu.xml"
+            line="25"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.array.car_facet_icons` appears to be unused"
+        errorLine1="    &lt;array name=&quot;car_facet_icons&quot; />"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/arrays_car.xml"
+            line="25"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.array.car_facet_intent_uris` appears to be unused"
+        errorLine1="    &lt;array name=&quot;car_facet_intent_uris&quot; />"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/arrays_car.xml"
+            line="26"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.array.car_facet_longpress_intent_uris` appears to be unused"
+        errorLine1="    &lt;array name=&quot;car_facet_longpress_intent_uris&quot; />"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/arrays_car.xml"
+            line="27"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.array.car_facet_package_filters` appears to be unused"
+        errorLine1="    &lt;array name=&quot;car_facet_package_filters&quot;/>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/arrays_car.xml"
+            line="28"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.array.car_facet_category_filters` appears to be unused"
+        errorLine1="    &lt;array name=&quot;car_facet_category_filters&quot;/>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/arrays_car.xml"
+            line="29"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.assist_disclosure_trace` appears to be unused"
+        errorLine1="&lt;pathInterpolator xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/interpolator/assist_disclosure_trace.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.background_protect_secondary` appears to be unused"
+        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/color/background_protect_secondary.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.background_protected` appears to be unused"
+        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/color/background_protected.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.car_navigation_button` appears to be unused"
+        errorLine1="&lt;merge xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/layout/car_navigation_button.xml"
+            line="20"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.car_rounded_bg_bottom` appears to be unused"
+        errorLine1="&lt;shape xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/car_rounded_bg_bottom.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.car_top_navigation_bar` appears to be unused"
+        errorLine1="&lt;com.android.systemui.statusbar.car.CarNavigationBarView"
+        errorLine2="^">
+        <location
+            file="res/layout/car_top_navigation_bar.xml"
+            line="20"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.car_user_switcher_close_pages_animation` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/anim/car_user_switcher_close_pages_animation.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.car_user_switcher_close_pod_animation` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/anim/car_user_switcher_close_pod_animation.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.car_user_switcher_open_pages_animation` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/anim/car_user_switcher_open_pages_animation.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.car_user_switcher_open_pod_animation` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/anim/car_user_switcher_open_pod_animation.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ticker_background_color` appears to be unused"
+        errorLine1="    &lt;drawable name=&quot;ticker_background_color&quot;>#ff1d1d1d&lt;/drawable>"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="21"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.notification_panel_solid_background` appears to be unused"
+        errorLine1="    &lt;color name=&quot;notification_panel_solid_background&quot;>#ff000000&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="25"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.status_bar_notification_row_background_color` appears to be unused"
+        errorLine1="    &lt;drawable name=&quot;status_bar_notification_row_background_color&quot;>#ff090909&lt;/drawable>"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="26"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.notification_list_shadow_top` appears to be unused"
+        errorLine1="    &lt;color name=&quot;notification_list_shadow_top&quot;>#80000000&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="27"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.heads_up_notification_bg_pressed` appears to be unused"
+        errorLine1="    &lt;drawable name=&quot;heads_up_notification_bg_pressed&quot;>#ff33B5E5&lt;/drawable>"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="28"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.qs_batterymeter_frame_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;qs_batterymeter_frame_color&quot;>#FF404040&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="29"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.qs_tile_divider` appears to be unused"
+        errorLine1="    &lt;color name=&quot;qs_tile_divider&quot;>#29ffffff&lt;/color>&lt;!-- 16% white -->"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="30"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.qs_detail_button` appears to be unused"
+        errorLine1="    &lt;color name=&quot;qs_detail_button&quot;>@*android:color/quaternary_device_default_settings&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="32"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.qs_detail_button_white` appears to be unused"
+        errorLine1="    &lt;color name=&quot;qs_detail_button_white&quot;>#B3FFFFFF&lt;/color>&lt;!-- 70% white -->"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="33"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.qs_user_detail_icon_muted` appears to be unused"
+        errorLine1="    &lt;color name=&quot;qs_user_detail_icon_muted&quot;>#FFFFFFFF&lt;/color> &lt;!-- not so muted after all -->"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="36"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.keyguard_overflow_content_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;keyguard_overflow_content_color&quot;>#ff686868&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="40"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.recents_task_view_lock_to_app_button_background_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;recents_task_view_lock_to_app_button_background_color&quot;>#ffe6e6e6&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="57"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.recents_task_view_lock_to_app_button_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;recents_task_view_lock_to_app_button_color&quot;>#ff666666&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="59"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.recents_freeform_workspace_bg_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;recents_freeform_workspace_bg_color&quot;>#33FFFFFF&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="61"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.keyguard_affordance` appears to be unused"
+        errorLine1="    &lt;color name=&quot;keyguard_affordance&quot;>#ffffffff&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="68"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.segmented_buttons_background` appears to be unused"
+        errorLine1="    &lt;color name=&quot;segmented_buttons_background&quot;>#14FFFFFF&lt;/color>&lt;!-- 8% white -->"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="121"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.logout_button_bg_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;logout_button_bg_color&quot;>#ccffffff&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="172"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.recents_tv_card_background_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;recents_tv_card_background_color&quot;>#FF263238&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors_tv.xml"
+            line="20"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.recents_tv_card_title_text_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;recents_tv_card_title_text_color&quot;>#CCEEEEEE&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors_tv.xml"
+            line="21"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.recents_tv_dismiss_text_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;recents_tv_dismiss_text_color&quot;>#7FEEEEEE&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors_tv.xml"
+            line="22"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.recents_tv_text_shadow_color` appears to be unused"
+        errorLine1="    &lt;color name=&quot;recents_tv_text_shadow_color&quot;>#7F000000&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors_tv.xml"
+            line="23"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.status_bar_config_maxNotificationIcons` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;status_bar_config_maxNotificationIcons&quot;>5&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-sw720dp/config.xml"
+            line="23"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.quick_settings_max_rows` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;quick_settings_max_rows&quot;>2&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-land/config.xml"
+            line="24"
+            column="14"/>
+        <location
+            file="res/values-sw600dp/config.xml"
+            line="24"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.bool.config_recents_use_hardware_layers` appears to be unused"
+        errorLine1="    &lt;bool name=&quot;config_recents_use_hardware_layers&quot;>false&lt;/bool>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="25"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.bool.config_notifications_round_rect_clipping` appears to be unused"
+        errorLine1="    &lt;bool name=&quot;config_notifications_round_rect_clipping&quot;>true&lt;/bool>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="38"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.config_maxNotificationIcons` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;config_maxNotificationIcons&quot;>5&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="59"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.bool.config_showPhoneRSSIForData` appears to be unused"
+        errorLine1="    &lt;bool name=&quot;config_showPhoneRSSIForData&quot;>false&lt;/bool>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="62"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.bool.config_showRotationLock` appears to be unused"
+        errorLine1="    &lt;bool name=&quot;config_showRotationLock&quot;>true&lt;/bool>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="68"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.config_vibration_duration` appears to be unused"
+        errorLine1="    &lt;integer translatable=&quot;false&quot; name=&quot;config_vibration_duration&quot;>0&lt;/integer>"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="71"
+            column="35"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.config_search_panel_view_vibration_duration` appears to be unused"
+        errorLine1="    &lt;integer translatable=&quot;false&quot; name=&quot;config_search_panel_view_vibration_duration&quot;>20&lt;/integer>"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="74"
+            column="35"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.one_finger_pop_duration_ms` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;one_finger_pop_duration_ms&quot;>10&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="90"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.bool.quick_settings_wide` appears to be unused"
+        errorLine1="    &lt;bool name=&quot;quick_settings_wide&quot;>false&lt;/bool>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="111"
+            column="11"/>
+        <location
+            file="res/values-land/dimens.xml"
+            line="34"
+            column="11"/>
+        <location
+            file="res/values-sw600dp-land/config.xml"
+            line="19"
+            column="11"/>
+        <location
+            file="res/values-w550dp-land/config.xml"
+            line="25"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.quick_settings_user_time_settings_tile_span` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;quick_settings_user_time_settings_tile_span&quot;>1&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="120"
+            column="14"/>
+        <location
+            file="res/values-land/config.xml"
+            line="27"
+            column="14"/>
+        <location
+            file="res/values-sw600dp/config.xml"
+            line="27"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.bool.quick_settings_rssi_tile_capitalization` appears to be unused"
+        errorLine1="    &lt;bool name=&quot;quick_settings_rssi_tile_capitalization&quot;>true&lt;/bool>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="141"
+            column="11"/>
+        <location
+            file="res/values-mcc262-mnc07/config.xml"
+            line="24"
+            column="11"/>
+        <location
+            file="res/values-mcc262-mnc08/config.xml"
+            line="24"
+            column="11"/>
+        <location
+            file="res/values-mcc262-mnc11/config.xml"
+            line="24"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.quick_settings_brightness_dialog_short_timeout` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;quick_settings_brightness_dialog_short_timeout&quot;>2000&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="144"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.quick_settings_brightness_dialog_long_timeout` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;quick_settings_brightness_dialog_long_timeout&quot;>4000&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="145"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.bool.doze_pulse_on_notifications` appears to be unused"
+        errorLine1="    &lt;bool name=&quot;doze_pulse_on_notifications&quot;>true&lt;/bool>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="237"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.days_to_show_hotspot_tile` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;days_to_show_hotspot_tile&quot;>30&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="304"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.days_to_show_color_inversion_tile` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;days_to_show_color_inversion_tile&quot;>7&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="307"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.zen_mode_max_conditions` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;zen_mode_max_conditions&quot;>5&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="313"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.carrier_network_change_anim_time` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;carrier_network_change_anim_time&quot;>3000&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="325"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.volume_expand_animation_duration` appears to be unused"
+        errorLine1="    &lt;item name=&quot;volume_expand_animation_duration&quot; type=&quot;integer&quot;>300&lt;/item>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="328"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.bool.quick_settings_show_full_alarm` appears to be unused"
+        errorLine1="    &lt;bool name=&quot;quick_settings_show_full_alarm&quot;>false&lt;/bool>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config.xml"
+            line="375"
+            column="11"/>
+        <location
+            file="res/values-sw410dp/config.xml"
+            line="23"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.bool.config_enablePersistentDockedActivity` appears to be unused"
+        errorLine1="    &lt;bool name=&quot;config_enablePersistentDockedActivity&quot;>false&lt;/bool>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config_car.xml"
+            line="23"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.config_persistentDockedActivityIntentUri` appears to be unused"
+        errorLine1="    &lt;string name=&quot;config_persistentDockedActivityIntentUri&quot; translatable=&quot;false&quot;>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/config_car.xml"
+            line="24"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.peek_window_y_offset` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;peek_window_y_offset&quot;>-12dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="20"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.fraction.battery_button_height_fraction` appears to be unused"
+        errorLine1="    &lt;fraction name=&quot;battery_button_height_fraction&quot;>10.5%&lt;/fraction>"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-hdpi/dimens.xml"
+            line="20"
+            column="15"/>
+        <location
+            file="res/values-mdpi/dimens.xml"
+            line="19"
+            column="15"/>
+        <location
+            file="res/values-tvdpi/dimens.xml"
+            line="19"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.fraction.battery_subpixel_smoothing_left` appears to be unused"
+        errorLine1="    &lt;fraction name=&quot;battery_subpixel_smoothing_left&quot;>20%&lt;/fraction>"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-hdpi/dimens.xml"
+            line="24"
+            column="15"/>
+        <location
+            file="res/values-mdpi/dimens.xml"
+            line="23"
+            column="15"/>
+        <location
+            file="res/values-tvdpi/dimens.xml"
+            line="23"
+            column="15"/>
+        <location
+            file="res/values-xhdpi/dimens.xml"
+            line="23"
+            column="15"/>
+        <location
+            file="res/values-xxhdpi/dimens.xml"
+            line="23"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.fraction.battery_subpixel_smoothing_right` appears to be unused"
+        errorLine1="    &lt;fraction name=&quot;battery_subpixel_smoothing_right&quot;>12%&lt;/fraction>"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-hdpi/dimens.xml"
+            line="25"
+            column="15"/>
+        <location
+            file="res/values-mdpi/dimens.xml"
+            line="24"
+            column="15"/>
+        <location
+            file="res/values-tvdpi/dimens.xml"
+            line="24"
+            column="15"/>
+        <location
+            file="res/values-xhdpi/dimens.xml"
+            line="24"
+            column="15"/>
+        <location
+            file="res/values-xxhdpi/dimens.xml"
+            line="24"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.notification_panel_min_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;notification_panel_min_height&quot;>770dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-sw720dp/dimens.xml"
+            line="28"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.panel_float` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;panel_float&quot;>56dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-sw720dp/dimens.xml"
+            line="30"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.peek_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;peek_height&quot;>@dimen/close_handle_height&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-sw600dp/dimens.xml"
+            line="39"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_brightness_padding_top` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_brightness_padding_top&quot;>6dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-sw600dp-land/dimens.xml"
+            line="41"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.snooze_option_text_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;snooze_option_text_size&quot;>14sp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="183"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.snooze_option_padding` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;snooze_option_padding&quot;>8dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="186"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.navigation_extra_key_width` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;navigation_extra_key_width&quot;>36dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="221"
+            column="12"/>
+        <location
+            file="res/values-sw360dp/dimens.xml"
+            line="23"
+            column="12"/>
+        <location
+            file="res/values-sw600dp/dimens.xml"
+            line="32"
+            column="12"/>
+        <location
+            file="res/values-sw900dp/dimens.xml"
+            line="23"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.navbar_search_snap_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;navbar_search_snap_margin&quot;>40dip&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="228"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.navbar_search_outerring_diameter` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;navbar_search_outerring_diameter&quot;>340dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="231"
+            column="12"/>
+        <location
+            file="res/values-sw600dp/dimens.xml"
+            line="23"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.navbar_search_outerring_radius` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;navbar_search_outerring_radius&quot;>170dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="234"
+            column="12"/>
+        <location
+            file="res/values-sw600dp/dimens.xml"
+            line="26"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.navbar_search_panel_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;navbar_search_panel_height&quot;>230dip&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="237"
+            column="12"/>
+        <location
+            file="res/values-sw600dp/dimens.xml"
+            line="29"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.close_handle_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;close_handle_height&quot;>36dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="243"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.car_status_bar_header_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;car_status_bar_header_height&quot;>128dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="249"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.status_bar_header_padding_bottom` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;status_bar_header_padding_bottom&quot;>48dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="252"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_header_system_icons_area_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_header_system_icons_area_height&quot;>48dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="256"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.status_bar_header_height_expanded` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;status_bar_header_height_expanded&quot;>124dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="273"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_dialog_base_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_dialog_base_margin&quot;>8dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="308"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_dialog_row_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_dialog_row_height&quot;>252dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="314"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_dialog_settings_icon_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_dialog_settings_icon_size&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="328"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.carrier_label_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;carrier_label_height&quot;>24dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="336"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.one_finger_pop_limit` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;one_finger_pop_limit&quot;>0dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="339"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.notification_panel_min_height_frac` appears to be unused"
+        errorLine1="    &lt;item type=&quot;dimen&quot; name=&quot;notification_panel_min_height_frac&quot;>0%&lt;/item>"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="343"
+            column="24"/>
+        <location
+            file="res/values-sw600dp/dimens.xml"
+            line="35"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.blinds_pop_threshold` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;blinds_pop_threshold&quot;>0dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="345"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_header_gear_translation` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_header_gear_translation&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="360"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_dual_tile_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_dual_tile_height&quot;>112dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="368"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_dual_tile_padding_vertical` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_dual_tile_padding_vertical&quot;>8dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="369"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_tile_padding_top_large_text` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_tile_padding_top_large_text&quot;>4dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="372"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_tile_padding_bottom` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_tile_padding_bottom&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="374"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_tile_spacing` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_tile_spacing&quot;>4dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="375"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_detail_header_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_detail_header_height&quot;>56dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="378"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_detail_back_margin_end` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_detail_back_margin_end&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="390"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_battery_padding` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_battery_padding&quot;>2dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="394"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_notif_collapsed_space` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_notif_collapsed_space&quot;>64dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="409"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_footer_dialog_icon_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_footer_dialog_icon_size&quot;>24sp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="423"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_footer_dialog_icon_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_footer_dialog_icon_margin&quot;>8sp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="425"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.zen_mode_condition_detail_button_padding` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;zen_mode_condition_detail_button_padding&quot;>8dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="433"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.zen_mode_condition_detail_item_spacing` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;zen_mode_condition_detail_item_spacing&quot;>12dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="436"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.glowpadview_glow_radius` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;glowpadview_glow_radius&quot;>75dip&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="448"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.glowpadview_inner_radius` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;glowpadview_inner_radius&quot;>15dip&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="451"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.notification_header_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;notification_header_height&quot;>53dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="473"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.speed_bump_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;speed_bump_height&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="482"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.edge_tap_area_width` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;edge_tap_area_width&quot;>48dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="527"
+            column="12"/>
+        <location
+            file="res/values-sw600dp/dimens.xml"
+            line="66"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.multi_user_switch_expanded_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;multi_user_switch_expanded_margin&quot;>8dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="536"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.multi_user_switch_collapsed_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;multi_user_switch_collapsed_margin&quot;>13dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="539"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.clock_expanded_bottom_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;clock_expanded_bottom_margin&quot;>20dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="553"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.clock_collapsed_bottom_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;clock_collapsed_bottom_margin&quot;>10dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="556"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.clock_collapsed_bottom_margin_large_text` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;clock_collapsed_bottom_margin_large_text&quot;>6dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="559"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.multi_user_switch_width_collapsed` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;multi_user_switch_width_collapsed&quot;>34dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="562"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.multi_user_switch_width_expanded` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;multi_user_switch_width_expanded&quot;>48dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="565"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.multi_user_avatar_collapsed_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;multi_user_avatar_collapsed_size&quot;>22dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="571"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_time_collapsed_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_time_collapsed_size&quot;>14sp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="580"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_date_collapsed_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_date_collapsed_size&quot;>14sp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="589"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.qs_date_time_translation` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;qs_date_time_translation&quot;>8dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="591"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.header_battery_margin_expanded` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;header_battery_margin_expanded&quot;>6dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="610"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.header_battery_margin_keyguard` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;header_battery_margin_keyguard&quot;>6dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="613"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.battery_level_text_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;battery_level_text_size&quot;>12sp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="653"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.wide_type_icon_start_padding` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;wide_type_icon_start_padding&quot;>2dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="680"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.signal_cluster_margin_start` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;signal_cluster_margin_start&quot;>2.5dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="705"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_slider_interspacing` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_slider_interspacing&quot;>8dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="749"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_offset_top` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_offset_top&quot;>0dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="752"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_button_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_button_size&quot;>48dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="755"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_dialog_margin_bottom` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_dialog_margin_bottom&quot;>4dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="758"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_dialog_padding_top` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_dialog_padding_top&quot;>8dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="759"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_dialog_padding_end` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_dialog_padding_end&quot;>40dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="760"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_row_padding_bottom` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_row_padding_bottom&quot;>9.4dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="762"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_row_padding_start` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_row_padding_start&quot;>4dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="763"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_row_header_padding_start` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_row_header_padding_start&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="764"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_row_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_row_height&quot;>64dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="765"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_row_slider_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_row_slider_height&quot;>48dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="766"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_row_slider_padding_start` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_row_slider_padding_start&quot;>12dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="767"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_expander_margin_end` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_expander_margin_end&quot;>2dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="769"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.volume_expander_margin_top` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;volume_expander_margin_top&quot;>6dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="770"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.fab_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;fab_size&quot;>56dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="778"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.fab_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;fab_margin&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="779"
+            column="12"/>
+        <location
+            file="res/values-sw600dp/dimens.xml"
+            line="84"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.fab_elevation` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;fab_elevation&quot;>12dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="780"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.fab_press_translation_z` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;fab_press_translation_z&quot;>9dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="781"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.battery_detail_graph_space_top` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;battery_detail_graph_space_top&quot;>27dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="789"
+            column="12"/>
+        <location
+            file="res/values-land/dimens.xml"
+            line="30"
+            column="12"/>
+        <location
+            file="res/values-sw600dp-land/dimens.xml"
+            line="37"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.battery_detail_graph_space_bottom` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;battery_detail_graph_space_bottom&quot;>27dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="790"
+            column="12"/>
+        <location
+            file="res/values-land/dimens.xml"
+            line="31"
+            column="12"/>
+        <location
+            file="res/values-sw600dp-land/dimens.xml"
+            line="38"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.recents_layout_side_margin_tablet_docked` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;recents_layout_side_margin_tablet_docked&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="810"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.recents_layout_side_margin_tablet_xlarge_docked` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;recents_layout_side_margin_tablet_xlarge_docked&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="812"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.recents_freeform_layout_bottom_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;recents_freeform_layout_bottom_margin&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="836"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.recents_freeform_layout_task_padding` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;recents_freeform_layout_task_padding&quot;>8dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="839"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.recents_task_affiliation_color_min_alpha_percentage` appears to be unused"
+        errorLine1="    &lt;item name=&quot;recents_task_affiliation_color_min_alpha_percentage&quot; format=&quot;float&quot; type=&quot;dimen&quot;>0.6&lt;/item>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="876"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.recents_task_view_remove_anim_translation_x` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;recents_task_view_remove_anim_translation_x&quot;>100dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="885"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.recents_recents_row_dim_alpha` appears to be unused"
+        errorLine1="    &lt;item name=&quot;recents_recents_row_dim_alpha&quot; format=&quot;float&quot; type=&quot;dimen&quot;>0.5&lt;/item>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="888"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.cell_overlay_padding` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;cell_overlay_padding&quot;>18dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="921"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.top_padding` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;top_padding&quot;>0dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="944"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.bottom_padding` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;bottom_padding&quot;>48dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="945"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.wireless_charging_dots_radius_start` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;wireless_charging_dots_radius_start&quot;>0dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="988"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.wireless_charging_dots_radius_end` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;wireless_charging_dots_radius_end&quot;>4dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="989"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.wireless_charging_circle_radius_start` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;wireless_charging_circle_radius_start&quot;>28dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="990"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.wireless_charging_circle_radius_end` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;wireless_charging_circle_radius_end&quot;>84dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="991"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.wireless_charging_angle_offset` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;wireless_charging_angle_offset&quot;>20&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="992"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.wireless_charging_scale_dots_duration` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;wireless_charging_scale_dots_duration&quot;>83&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="993"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.wireless_charging_num_dots` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;wireless_charging_num_dots&quot;>16&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="994"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.logout_button_layout_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;logout_button_layout_height&quot;>32dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="1018"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.logout_button_padding_horizontal` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;logout_button_padding_horizontal&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="1019"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.logout_button_margin_bottom` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;logout_button_margin_bottom&quot;>12dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="1020"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.logout_button_corner_radius` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;logout_button_corner_radius&quot;>2dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens.xml"
+            line="1021"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.car_navigation_button_width` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;car_navigation_button_width&quot;>64dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens_car.xml"
+            line="26"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.car_navigation_bar_width` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;car_navigation_bar_width&quot;>760dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens_car.xml"
+            line="27"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.car_user_switcher_container_anim_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;car_user_switcher_container_anim_height&quot;>-420dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens_car.xml"
+            line="44"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.recents_grid_padding_left_right` appears to be unused"
+        errorLine1="  &lt;dimen name=&quot;recents_grid_padding_left_right&quot;>32dp&lt;/dimen>"
+        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens_grid.xml"
+            line="19"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.recents_grid_padding_top_bottom` appears to be unused"
+        errorLine1="  &lt;dimen name=&quot;recents_grid_padding_top_bottom&quot;>150dp&lt;/dimen>"
+        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/dimens_grid.xml"
+            line="20"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.dismiss_all_shape` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/dismiss_all_shape.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.dismiss_all_shape_animation` appears to be unused"
+        errorLine1="&lt;animated-vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/dismiss_all_shape_animation.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.dismiss_all_shape_animation_1` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/anim/dismiss_all_shape_animation_1.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.dismiss_all_shape_animation_2` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/anim/dismiss_all_shape_animation_2.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.dismiss_all_shape_animation_3` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/anim/dismiss_all_shape_animation_3.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.dismiss_all_shape_animation_rectangle_path_1` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/anim/dismiss_all_shape_animation_rectangle_path_1.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.dismiss_all_shape_animation_rectangle_path_1_1` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/anim/dismiss_all_shape_animation_rectangle_path_1_1.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.dismiss_all_shape_animation_rectangle_path_1_2` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/anim/dismiss_all_shape_animation_rectangle_path_1_2.xml"
+            line="15"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.divider` appears to be unused"
+        errorLine1="&lt;View xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/layout/divider.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.fab_elevation` appears to be unused"
+        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/anim/fab_elevation.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.fingerprint_icon` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/fingerprint_icon.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.header_dot` appears to be unused"
+        errorLine1="&lt;shape"
+        errorLine2="^">
+        <location
+            file="res/drawable/header_dot.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.horizontal_divider` appears to be unused"
+        errorLine1="&lt;View"
+        errorLine2="^">
+        <location
+            file="res/layout/horizontal_divider.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_access_alarms_small` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_access_alarms_small.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_android` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_android.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_aod_charging_24dp` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_aod_charging_24dp.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_cancel_white_24dp` appears to be unused">
+        <location
+            file="res/drawable-hdpi/ic_cancel_white_24dp.png"/>
+        <location
+            file="res/drawable-mdpi/ic_cancel_white_24dp.png"/>
+        <location
+            file="res/drawable-xhdpi/ic_cancel_white_24dp.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_cast` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_cast.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_chevron_left` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_chevron_left.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_chevron_up` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_chevron_up.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_close` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_close.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_data_off` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_data_off.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_data_on` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_data_on.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_data_unavailable` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_data_unavailable.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.mipmap.ic_daydreams` appears to be unused">
+        <location
+            file="res/mipmap-hdpi/ic_daydreams.png"/>
+        <location
+            file="res/mipmap-mdpi/ic_daydreams.png"/>
+        <location
+            file="res/mipmap-xhdpi/ic_daydreams.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_delete` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_delete.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_dismiss_outline` appears to be unused">
+        <location
+            file="res/drawable-hdpi/ic_dismiss_outline.png"/>
+        <location
+            file="res/drawable-mdpi/ic_dismiss_outline.png"/>
+        <location
+            file="res/drawable-xhdpi/ic_dismiss_outline.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_drag_handle` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_drag_handle.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_expand_less` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_expand_less.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_expand_more` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_expand_more.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_history` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_history.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_hotspot_unavailable` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_hotspot_unavailable.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_invert_colors` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_invert_colors.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_landscape_to_rotate_animation_interpolator_0` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_landscape_to_rotate_animation_interpolator_0.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_landscape_to_rotate_arrows_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_landscape_to_rotate_arrows_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_landscape_to_rotate_bottom_merged_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_landscape_to_rotate_bottom_merged_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_landscape_to_rotate_landscape_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_landscape_to_rotate_landscape_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_lock_to_app_24dp` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_lock_to_app_24dp.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_notify_button_bg` appears to be unused"
+        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_notify_button_bg.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_person` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_person.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_portrait_to_rotate_arrows_0_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_portrait_to_rotate_arrows_0_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_portrait_to_rotate_arrows_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_portrait_to_rotate_arrows_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_portrait_to_rotate_bottom_merged_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_portrait_to_rotate_bottom_merged_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_portrait_to_rotate_device_0_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_portrait_to_rotate_device_0_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_portrait_to_rotate_device_merged_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_portrait_to_rotate_device_merged_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_qs_back` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_qs_back.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_qs_battery_saver` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_qs_battery_saver.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_qs_lock` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_qs_lock.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_qs_lock_open` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_qs_lock_open.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_qs_network_logging` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_qs_network_logging.xml"
+            line="19"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_qs_ringer_audible` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_qs_ringer_audible.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_qs_ringer_silent` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_qs_ringer_silent.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_qs_ringer_vibrate` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_qs_ringer_vibrate.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_rotate_to_landscape_animation_interpolator_0` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_rotate_to_landscape_animation_interpolator_0.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_rotate_to_landscape_arrows_0_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_rotate_to_landscape_arrows_0_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_rotate_to_landscape_arrows_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_rotate_to_landscape_arrows_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_rotate_to_landscape_bottom_merged_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_rotate_to_landscape_bottom_merged_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_rotate_to_landscape_landscape_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_rotate_to_landscape_landscape_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_rotate_to_portrait_animation_interpolator_0` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_rotate_to_portrait_animation_interpolator_0.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_rotate_to_portrait_arrows_0_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_rotate_to_portrait_arrows_0_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_rotate_to_portrait_arrows_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_rotate_to_portrait_arrows_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_rotate_to_portrait_bottom_merged_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_rotate_to_portrait_bottom_merged_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_rotate_to_portrait_device_0_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_rotate_to_portrait_device_0_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_rotate_to_portrait_device_merged_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_rotate_to_portrait_device_merged_animation.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_blink_1` appears to be unused"
+        errorLine1="&lt;objectAnimator xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_blink_1.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_blink_2` appears to be unused"
+        errorLine1="&lt;objectAnimator xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_blink_2.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_blink_3` appears to be unused"
+        errorLine1="&lt;objectAnimator xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_blink_3.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_signal_workmode_disable_animation` appears to be unused"
+        errorLine1="&lt;animated-vector"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_signal_workmode_disable_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_disable_animation_interpolator_0` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_disable_animation_interpolator_0.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_disable_animation_interpolator_1` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_disable_animation_interpolator_1.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_disable_animation_interpolator_2` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_disable_animation_interpolator_2.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_disable_animation_interpolator_3` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_disable_animation_interpolator_3.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_disable_animation_interpolator_4` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_disable_animation_interpolator_4.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_disable_animation_interpolator_5` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_disable_animation_interpolator_5.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_disable_cross_1_pathdata_interpolator` appears to be unused"
+        errorLine1="&lt;pathInterpolator xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_disable_cross_1_pathdata_interpolator.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_left_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_left_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_mask_1_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_mask_1_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_rectangle_path_3_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_rectangle_path_3_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_rectangle_path_3_position_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_rectangle_path_3_position_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_rectangle_path_4_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_rectangle_path_4_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_rectangle_path_4_position_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_rectangle_path_4_position_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_right_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_right_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_stick_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_stick_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_stickito_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_stickito_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_disable_whole_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_disable_whole_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_signal_workmode_enable` appears to be unused"
+        errorLine1="&lt;vector"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_signal_workmode_enable.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_signal_workmode_enable_animation` appears to be unused"
+        errorLine1="&lt;animated-vector"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_signal_workmode_enable_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_animation_cross_1` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_animation_cross_1.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_animation_ic_signal_briefcase` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_animation_ic_signal_briefcase.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_enable_animation_interpolator_0` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_enable_animation_interpolator_0.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_enable_animation_interpolator_1` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_enable_animation_interpolator_1.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_enable_animation_interpolator_2` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_enable_animation_interpolator_2.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_enable_animation_interpolator_3` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_enable_animation_interpolator_3.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_enable_animation_interpolator_4` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_enable_animation_interpolator_4.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_enable_animation_interpolator_5` appears to be unused"
+        errorLine1="&lt;pathInterpolator"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_enable_animation_interpolator_5.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_animation_mask` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_animation_mask.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_enable_cross_1_pathdata_interpolator` appears to be unused"
+        errorLine1="&lt;pathInterpolator xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_enable_cross_1_pathdata_interpolator.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_left_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_left_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_mask_1_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_mask_1_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.interpolator.ic_signal_workmode_enable_mask_pathdata_interpolator` appears to be unused"
+        errorLine1="&lt;pathInterpolator xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/interpolator/ic_signal_workmode_enable_mask_pathdata_interpolator.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_rectangle_path_3_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_rectangle_path_3_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_rectangle_path_3_position_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_rectangle_path_3_position_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_rectangle_path_4_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_rectangle_path_4_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_rectangle_path_4_position_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_rectangle_path_4_position_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_right_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_right_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_stick_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_stick_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_stickito_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_stickito_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.ic_signal_workmode_enable_whole_animation` appears to be unused"
+        errorLine1="&lt;set"
+        errorLine2="^">
+        <location
+            file="res/anim/ic_signal_workmode_enable_whole_animation.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_sim` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_sim.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_speaker` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_speaker.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_speaker_group` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_speaker_group.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_swap` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_swap.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_sysbar_back_light_old` appears to be unused">
+        <location
+            file="res/drawable-sw900dp-xxhdpi/ic_sysbar_back_light_old.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_sysbar_lights_out_dot_large` appears to be unused">
+        <location
+            file="res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_tv` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_tv.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_width` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_width.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_zen_all` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_zen_all.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_zen_important` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_zen_important.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_zen_none` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_zen_none.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.integer.car_user_switcher_anim_cascade_delay_ms` appears to be unused"
+        errorLine1="    &lt;integer name=&quot;car_user_switcher_anim_cascade_delay_ms&quot;>27&lt;/integer>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/integers_car.xml"
+            line="19"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.navigation_bar_height` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;navigation_bar_height&quot;>@*android:dimen/navigation_bar_height&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/internal.xml"
+            line="19"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.navigation_bar_height_car_mode` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;navigation_bar_height_car_mode&quot;>@*android:dimen/navigation_bar_height_car_mode&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/internal.xml"
+            line="20"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.keyguard_overflow_number_background` appears to be unused"
+        errorLine1="&lt;shape xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/keyguard_overflow_number_background.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.logout_button_background` appears to be unused"
+        errorLine1="&lt;shape xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/logout_button_background.xml"
+            line="19"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.moon_size` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;moon_size&quot;>30dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/mland_config.xml"
+            line="33"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.nav_bar_tuner_inflater` appears to be unused"
+        errorLine1="&lt;com.android.systemui.tuner.PreviewNavInflater"
+        errorLine2="^">
+        <location
+            file="res/layout/nav_bar_tuner_inflater.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.nav_control_widget` appears to be unused"
+        errorLine1="&lt;LinearLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/nav_control_widget.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.nav_width_view` appears to be unused"
+        errorLine1="&lt;SeekBar"
+        errorLine2="^">
+        <location
+            file="res/layout/nav_width_view.xml"
+            line="20"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.navigation_bar_app_item` appears to be unused"
+        errorLine1="&lt;ImageView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/layout/navigation_bar_app_item.xml"
+            line="21"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.notification_expand_more` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/notification_expand_more.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.notification_guts_buttons` appears to be unused"
+        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/color/notification_guts_buttons.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.pin_delete_color` appears to be unused"
+        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/color/pin_delete_color.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.pin_divider_color` appears to be unused"
+        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/color/pin_divider_color.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pip_dismiss` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pip_dismiss.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pip_notification_icon` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pip_notification_icon.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pop_ball` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pop_ball.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pop_belt` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pop_belt.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pop_droid` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pop_droid.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pop_pizza` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pop_pizza.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pop_stripes` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pop_stripes.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pop_swirl` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pop_swirl.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pop_vortex` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pop_vortex.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.pop_vortex2` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/pop_vortex2.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.preference_widget_settings` appears to be unused"
+        errorLine1="&lt;LinearLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/preference_widget_settings.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.qs_add_tiles_list` appears to be unused"
+        errorLine1="&lt;FrameLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/qs_add_tiles_list.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.qs_subhead_caret` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/qs_subhead_caret.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.qs_tile_background` appears to be unused"
+        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/drawable/qs_tile_background.xml"
+            line="19"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.qs_tile_layout` appears to be unused"
+        errorLine1="&lt;com.android.systemui.qs.TileLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/qs_tile_layout.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.qs_user_detail_name` appears to be unused"
+        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/color/qs_user_detail_name.xml"
+            line="19"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.quick_header_bg` appears to be unused"
+        errorLine1="&lt;ripple xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/quick_header_bg.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.recents_freeform_workspace_bg` appears to be unused"
+        errorLine1="&lt;shape xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/recents_freeform_workspace_bg.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.recents_move_task_freeform_dark` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/recents_move_task_freeform_dark.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.recents_move_task_freeform_light` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/recents_move_task_freeform_light.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.recents_search_bar` appears to be unused"
+        errorLine1="&lt;FrameLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/recents_search_bar.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.recents_status_gradient` appears to be unused">
+        <location
+            file="res/drawable-hdpi/recents_status_gradient.9.png"/>
+        <location
+            file="res/drawable-mdpi/recents_status_gradient.9.png"/>
+        <location
+            file="res/drawable-xhdpi/recents_status_gradient.9.png"/>
+        <location
+            file="res/drawable-xxhdpi/recents_status_gradient.9.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.recents_task_shadow` appears to be unused">
+        <location
+            file="res/drawable-xxhdpi/recents_task_shadow.9.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.recents_task_view_header_progress_bar` appears to be unused"
+        errorLine1="&lt;ProgressBar"
+        errorLine2="^">
+        <location
+            file="res/layout/recents_task_view_header_progress_bar.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.remote` appears to be unused">
+        <location
+            file="res/drawable-xhdpi/remote.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.scorecard_gameover` appears to be unused"
+        errorLine1="&lt;shape"
+        errorLine2="^">
+        <location
+            file="res/drawable/scorecard_gameover.xml"
+            line="2"
+            column="1"/>
+        <location
+            file="res/drawable-nodpi/scorecard_gameover.xml"
+            line="2"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.search_bg_transparent` appears to be unused">
+        <location
+            file="res/drawable-hdpi/search_bg_transparent.9.png"/>
+        <location
+            file="res/drawable-mdpi/search_bg_transparent.9.png"/>
+        <location
+            file="res/drawable-xhdpi/search_bg_transparent.9.png"/>
+        <location
+            file="res/drawable-xxhdpi/search_bg_transparent.9.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.search_panel_scrim` appears to be unused"
+        errorLine1="&lt;shape xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
+        errorLine2="^">
+        <location
+            file="res/drawable-land/search_panel_scrim.xml"
+            line="19"
+            column="1"/>
+        <location
+            file="res/drawable-sw600dp/search_panel_scrim.xml"
+            line="19"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.shelf_menu_anchor` appears to be unused"
+        errorLine1="&lt;FrameLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/layout/shelf_menu_anchor.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.signal_cluster_view` appears to be unused"
+        errorLine1="&lt;com.android.systemui.statusbar.SignalClusterView"
+        errorLine2="^">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="20"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.split_clock_view` appears to be unused"
+        errorLine1="&lt;com.android.systemui.statusbar.policy.SplitClockView"
+        errorLine2="^">
+        <location
+            file="res/layout/split_clock_view.xml"
+            line="19"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_notify_more` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_notify_more.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_auto_rotate_landscape` appears to be unused"
+        errorLine1="&lt;inset xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_auto_rotate_landscape.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_auto_rotate_portrait` appears to be unused"
+        errorLine1="&lt;inset xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_auto_rotate_portrait.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_managed_profile_status_off` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_managed_profile_status_off.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_no_sims` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_no_sims.xml"
+            line="19"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_signal_in` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_signal_in.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_signal_inout` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_signal_inout.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_signal_out` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_signal_out.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_wifi_in` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_wifi_in.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_wifi_inout` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_wifi_inout.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.stat_sys_wifi_out` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/stat_sys_wifi_out.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.status_bar_alarm_group` appears to be unused"
+        errorLine1="&lt;LinearLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/status_bar_alarm_group.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.status_bar_no_recent_apps` appears to be unused"
+        errorLine1="&lt;FrameLayout"
+        errorLine2="^">
+        <location
+            file="res/layout/status_bar_no_recent_apps.xml"
+            line="20"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_clear_all_button` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_clear_all_button&quot;>Clear&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-af-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-am-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ar-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-be-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-bg-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ca-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-cs-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-da-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-de-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-el-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-en-rGB-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-es-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-es-rUS-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-et-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-fa-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-fi-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-fr-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-hi-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-hr-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-hu-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-in-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-it-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-iw-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ja-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ko-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-lt-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-lv-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ms-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-nb-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-nl-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-pl-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-pt-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ro-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-ru-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-sk-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-sl-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-sr-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-sv-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-sw-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-th-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-tl-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-tr-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-uk-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-vi-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW-large/strings.xml"
+            line="22"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="23"
+            column="13"/>
+        <location
+            file="res/values-zu-large/strings.xml"
+            line="22"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_recent_remove_item_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_recent_remove_item_title&quot;>Remove from list&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="28"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="24"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="24"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_recent_inspect_item_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_recent_inspect_item_title&quot;>App info&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="31"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="25"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="25"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_no_recent_apps` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_no_recent_apps&quot;>Your recent screens appear here&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="26"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="26"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_accessibility_dismiss_recents` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_accessibility_dismiss_recents&quot;>Dismiss recent apps&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="27"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="27"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.plurals.status_bar_accessibility_recent_apps` appears to be unused"
+        errorLine1="    &lt;plurals name=&quot;status_bar_accessibility_recent_apps&quot;>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="42"
+            column="14"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="28"
+            column="14"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="28"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_no_notifications_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_no_notifications_title&quot;>No notifications&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="30"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="32"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_ongoing_events_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_ongoing_events_title&quot;>Ongoing&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="31"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="33"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="33"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_latest_events_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_latest_events_title&quot;>Notifications&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="59"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="32"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="34"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="34"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_low_percent_format_hybrid` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_low_percent_format_hybrid&quot;>&lt;xliff:g id=&quot;percentage&quot;>%1$s&lt;/xliff:g> remaining, about &lt;xliff:g id=&quot;time&quot;>%2$s&lt;/xliff:g> left based on your usage&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="35"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="37"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_low_percent_format_hybrid_short` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_low_percent_format_hybrid_short&quot;>&lt;xliff:g id=&quot;percentage&quot;>%1$s&lt;/xliff:g> remaining, about &lt;xliff:g id=&quot;time&quot;>%2$s&lt;/xliff:g> left&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="78"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="36"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="38"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_low_percent_format_saver_started` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_low_percent_format_saver_started&quot;>&lt;xliff:g id=&quot;percentage&quot;>%s&lt;/xliff:g> remaining. Battery Saver is on.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="37"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="39"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="39"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.invalid_charger` appears to be unused"
+        errorLine1="    &lt;string name=&quot;invalid_charger&quot;>Can\&apos;t charge via USB. Use the charger that came with your device.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="87"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="44"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="38"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="42"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="40"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="40"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_low_why` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_low_why&quot;>Settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="97"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="44"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="44"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="44"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="44"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="41"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="44"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="44"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="43"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="43"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_settings_settings_button` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_settings_settings_button&quot;>Settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="109"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="51"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="45"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="47"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="47"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_settings_wifi_button` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_settings_wifi_button&quot;>Wi-Fi&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="46"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="49"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="48"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_settings_mute_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_settings_mute_label&quot;>MUTE&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="51"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="51"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="51"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="51"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="48"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="51"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="51"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="50"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_settings_notifications` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_settings_notifications&quot;>Notifications&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="124"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="50"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="52"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.bluetooth_tethered` appears to be unused"
+        errorLine1="    &lt;string name=&quot;bluetooth_tethered&quot;>Bluetooth tethered&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="130"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="51"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="53"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_input_method_settings_configure_input_methods` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_input_method_settings_configure_input_methods&quot;>Set up input methods&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="58"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="52"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="54"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="54"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_use_physical_keyboard` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_use_physical_keyboard&quot;>Physical keyboard&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="59"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="53"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="56"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="57"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="55"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="55"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.compat_mode_on` appears to be unused"
+        errorLine1="    &lt;string name=&quot;compat_mode_on&quot;>Zoom to fill screen&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="74"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="68"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="70"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="70"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.compat_mode_off` appears to be unused"
+        errorLine1="    &lt;string name=&quot;compat_mode_off&quot;>Stretch to fill screen&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="185"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="69"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="72"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="71"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.screenshot_saving_ticker` appears to be unused"
+        errorLine1="    &lt;string name=&quot;screenshot_saving_ticker&quot;>Saving screenshot\u2026&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="191"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="77"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="74"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="74"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="74"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="74"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="71"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="74"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="74"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="75"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="73"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="73"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.usb_preference_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;usb_preference_title&quot;>USB file transfer options&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="79"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="81"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.use_mtp_button_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;use_mtp_button_title&quot;>Mount as a media player (MTP)&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="80"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="82"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.use_ptp_button_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;use_ptp_button_title&quot;>Mount as a camera (PTP)&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="213"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="87"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="81"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="83"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="83"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.installer_cd_button_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;installer_cd_button_title&quot;>Install Android File Transfer app for Mac&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="215"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="88"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="82"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="85"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="86"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="84"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="84"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_search_light` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_search_light&quot;>Search&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="95"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="92"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="93"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="92"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="93"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="92"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="93"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="93"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="92"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="89"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="93"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="92"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="93"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="93"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="93"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="92"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="93"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="91"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="91"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.recents_caption_resize` appears to be unused"
+        errorLine1="    &lt;string name=&quot;recents_caption_resize&quot;>Select new task layout&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="105"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="105"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="105"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="105"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="102"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="105"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="105"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="104"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="104"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_fingerprint_dialog_app_icon` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_fingerprint_dialog_app_icon&quot;>Application icon&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="109"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="109"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="109"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="109"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="106"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="109"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="109"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="108"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_compatibility_zoom_button` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_compatibility_zoom_button&quot;>Compatibility zoom button.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="108"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="110"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="110"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_compatibility_zoom_example` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_compatibility_zoom_example&quot;>Zoom smaller to larger screen.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="109"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="111"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_bluetooth_disconnected` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_bluetooth_disconnected&quot;>Bluetooth disconnected.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="111"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="113"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_no_battery` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_no_battery&quot;>No battery.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="112"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="114"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_battery_one_bar` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_one_bar&quot;>Battery one bar.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="113"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="115"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_battery_two_bars` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_two_bars&quot;>Battery two bars.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="114"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="116"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_battery_three_bars` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_three_bars&quot;>Battery three bars.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="287"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="121"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="115"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="117"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="117"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_battery_full` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_full&quot;>Battery full.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="289"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="122"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="116"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="119"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="120"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="118"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="118"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_wifi_name` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_wifi_name&quot;>Connected to &lt;xliff:g id=&quot;wifi&quot; example=&quot;Home Network&quot;>%s&lt;/xliff:g>.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="130"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="130"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="130"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="130"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="127"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="130"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="130"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="129"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="129"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_no_wimax` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_no_wimax&quot;>No WiMAX.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="324"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="130"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="132"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_wimax_one_bar` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_wimax_one_bar&quot;>WiMAX one bar.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="326"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="131"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="133"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_wimax_two_bars` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_wimax_two_bars&quot;>WiMAX two bars.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="328"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="132"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="134"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_wimax_three_bars` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_wimax_three_bars&quot;>WiMAX three bars.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="330"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="133"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="135"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="135"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_wimax_signal_full` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_wimax_signal_full&quot;>WiMAX signal full.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="332"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="140"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="134"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="138"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="136"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="136"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_no_signal` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_no_signal&quot;>No signal.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="340"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="140"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="140"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="140"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="140"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="137"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="140"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="140"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="139"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_zero_bars` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_zero_bars&quot;>Zero bars.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="344"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="139"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="141"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_one_bar` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_one_bar&quot;>One bar.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="346"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="140"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="142"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_two_bars` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_two_bars&quot;>Two bars.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="348"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="141"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="143"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_three_bars` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_three_bars&quot;>Three bars.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="350"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="142"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="144"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_signal_full` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_signal_full&quot;>Signal full.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="352"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="143"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="145"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_desc_on` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_desc_on&quot;>On.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="355"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="144"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="146"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_desc_off` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_desc_off&quot;>Off.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="357"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="145"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="147"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_desc_connected` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_desc_connected&quot;>Connected.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="152"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="146"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="148"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="148"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_desc_connecting` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_desc_connecting&quot;>Connecting.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="147"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="150"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="149"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.data_connection_hspa` appears to be unused"
+        errorLine1="    &lt;string name=&quot;data_connection_hspa&quot;>HSPA&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="155"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="152"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="152"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="152"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="152"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="149"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="152"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="152"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="153"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="151"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="151"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_data_connection_wifi` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_data_connection_wifi&quot;>Wi-Fi&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="400"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="160"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="162"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_no_sim` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_no_sim&quot;>No SIM.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="403"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="161"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="163"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_cell_data` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_cell_data&quot;>Mobile Data&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="162"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="164"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="164"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_cell_data_on` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_cell_data_on&quot;>Mobile Data On&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="169"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="163"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="167"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="165"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="165"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_bluetooth_tether` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_bluetooth_tether&quot;>Bluetooth tethering.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="418"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="169"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="169"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="169"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="169"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="166"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="169"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="169"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="168"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_vpn_on` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_vpn_on&quot;>VPN on.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="174"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="168"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="170"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="170"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_no_sims` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_no_sims&quot;>No SIM card.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="169"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="172"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="171"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_battery_details` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_battery_details&quot;>Open battery details&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="433"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="174"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="174"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="174"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="174"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="171"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="174"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="174"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="173"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="173"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_settings_button` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_settings_button&quot;>System settings.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="442"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="174"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="176"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="176"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_notifications_button` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_notifications_button&quot;>Notifications.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="175"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="177"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_remove_notification` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_remove_notification&quot;>Clear notification.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="451"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="177"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="179"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_gps_enabled` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_gps_enabled&quot;>GPS enabled.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="454"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="184"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="184"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="184"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="184"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="178"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="184"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="184"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="184"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="184"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="180"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="180"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_gps_acquiring` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_gps_acquiring&quot;>GPS acquiring.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="457"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="185"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="185"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="185"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="185"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="179"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="184"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="185"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="185"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="185"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="182"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="185"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="183"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="181"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="181"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_work_mode` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_work_mode&quot;>@string/quick_settings_work_mode_label&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="472"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_recents_item_launched` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_recents_item_launched&quot;>Starting &lt;xliff:g id=&quot;app&quot; example=&quot;Calendar&quot;>%s&lt;/xliff:g>.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="197"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="197"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="197"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="197"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="191"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="197"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="197"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="197"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="197"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="193"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="193"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_notification_dismissed` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_notification_dismissed&quot;>Notification dismissed.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="192"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="197"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="195"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="194"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="194"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_desc_settings` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_desc_settings&quot;>Settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="199"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="199"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="199"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="199"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="196"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="201"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="199"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="198"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="198"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_wifi` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_wifi&quot;>&lt;xliff:g id=&quot;signal&quot; example=&quot;Three bars&quot;>%1$s&lt;/xliff:g>.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="203"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="203"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="203"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="203"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="200"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="203"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="202"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="202"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_mobile` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_mobile&quot;>Mobile &lt;xliff:g id=&quot;signal&quot; example=&quot;Three bars&quot;>%1$s&lt;/xliff:g>. &lt;xliff:g id=&quot;type&quot; example=&quot;4G&quot;>%2$s&lt;/xliff:g>. &lt;xliff:g id=&quot;network&quot; example=&quot;T-Mobile&quot;>%3$s&lt;/xliff:g>.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="203"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="205"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_battery` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_battery&quot;>Battery &lt;xliff:g id=&quot;state&quot; example=&quot;50% charging&quot;>%s&lt;/xliff:g>.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="204"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="206"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_airplane_off` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_airplane_off&quot;>Airplane mode off.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="205"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="207"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="207"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_airplane_on` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_airplane_on&quot;>Airplane mode on.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="212"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="212"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="212"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="212"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="206"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="211"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="212"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="212"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="212"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="209"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="212"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="210"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="208"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="208"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_bluetooth_off` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_bluetooth_off&quot;>Bluetooth off.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="218"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="218"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="218"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="218"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="215"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="218"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="217"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_bluetooth_connecting` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_bluetooth_connecting&quot;>Bluetooth connecting.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="223"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="223"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="223"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="223"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="217"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="223"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="223"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="223"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="223"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="219"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="219"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_bluetooth_connected` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_bluetooth_connected&quot;>Bluetooth connected.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="224"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="224"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="224"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="224"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="218"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="223"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="224"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="224"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="224"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="221"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="224"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="222"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="220"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="220"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_close` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_close&quot;>Close panel.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="229"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="229"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="229"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="229"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="226"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="229"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="230"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="228"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="228"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_flashlight_off` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_flashlight_off&quot;>Flashlight off.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="229"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="234"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="232"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="231"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_flashlight_on` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_flashlight_on&quot;>Flashlight on.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="237"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="234"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="237"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="234"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="237"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="237"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="234"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="234"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="231"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="236"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="237"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="237"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="237"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="234"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="237"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="235"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="233"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="233"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_ambient_display_charging` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_ambient_display_charging&quot;>Charging&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="246"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="248"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.data_usage_disabled_dialog_3g_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;data_usage_disabled_dialog_3g_title&quot;>2G-3G data is paused&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="247"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="249"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="249"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.data_usage_disabled_dialog_4g_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;data_usage_disabled_dialog_4g_title&quot;>4G data is paused&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="254"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="254"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="254"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="254"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="248"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="254"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="254"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="254"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="251"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="254"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="252"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="250"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="250"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.gps_notification_searching_text` appears to be unused"
+        errorLine1="    &lt;string name=&quot;gps_notification_searching_text&quot;>Searching for GPS&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="613"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="259"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="259"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="259"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="259"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="253"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="259"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="259"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="259"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="259"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="255"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="255"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.gps_notification_found_text` appears to be unused"
+        errorLine1="    &lt;string name=&quot;gps_notification_found_text&quot;>Location set by GPS&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="616"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="260"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="260"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="260"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="260"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="254"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="259"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="260"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="260"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="260"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="257"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="260"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="258"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="256"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="256"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_notification_inspect_item_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_notification_inspect_item_title&quot;>Notification settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="637"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="263"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="265"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.status_bar_notification_app_settings_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;status_bar_notification_app_settings_title&quot;>&lt;xliff:g id=&quot;app_name&quot; example=&quot;Calendar&quot;>%s&lt;/xliff:g> settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="641"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="264"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="266"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="266"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_rotation_lock_off` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_rotation_lock_off&quot;>Screen will rotate automatically.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="644"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="265"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="267"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="267"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_rotation_lock_off_changed` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_rotation_lock_off_changed&quot;>Screen will now rotate automatically.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="653"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="268"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="270"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_rotation_lock_on_landscape_changed` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_rotation_lock_on_landscape_changed&quot;>Screen is now locked in landscape orientation.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="656"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="269"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="271"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="271"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_rotation_lock_on_portrait_changed` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_rotation_lock_on_portrait_changed&quot;>Screen is now locked in portrait orientation.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="270"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="274"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="272"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="272"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.ethernet_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;ethernet_label&quot;>Ethernet&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="668"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="273"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="275"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="275"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_dnd_priority_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_dnd_priority_label&quot;>Priority only&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="675"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="276"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="278"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_dnd_alarms_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_dnd_alarms_label&quot;>Alarms only&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="677"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="287"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="277"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="279"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="279"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_dnd_none_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_dnd_none_label&quot;>Total silence&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="679"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="288"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="278"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="280"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_bluetooth_multiple_devices_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_bluetooth_multiple_devices_label&quot;>Bluetooth (&lt;xliff:g id=&quot;number&quot;>%d&lt;/xliff:g> Devices)&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="683"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="288"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="288"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="280"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="286"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="288"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="288"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="288"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="288"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="284"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="282"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="282"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_bluetooth_off_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_bluetooth_off_label&quot;>Bluetooth Off&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="685"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="291"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="289"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="289"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="287"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="287"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="287"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="281"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="287"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="287"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="289"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="289"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="289"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="289"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="285"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="283"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="283"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_brightness_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_brightness_label&quot;>Brightness&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="288"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="290"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="290"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_rotation_value` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_rotation_value&quot;>&lt;xliff:g name=&quot;rotation&quot; example=&quot;Portrait&quot;>%s&lt;/xliff:g> mode&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="705"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="291"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="293"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_rotation_locked_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_rotation_locked_label&quot;>Rotation locked&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="292"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="294"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_rotation_locked_portrait_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_rotation_locked_portrait_label&quot;>Portrait&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="293"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="295"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_rotation_locked_landscape_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_rotation_locked_landscape_label&quot;>Landscape&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="294"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="296"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="296"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_ime_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_ime_label&quot;>Input Method&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="295"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="297"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_location_off_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_location_off_label&quot;>Location Off&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="717"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="297"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="299"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_media_device_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_media_device_label&quot;>Media device&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="719"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="298"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="300"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_rssi_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_rssi_label&quot;>RSSI&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="721"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="299"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="301"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_rssi_emergency_only` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_rssi_emergency_only&quot;>Emergency Calls Only&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="723"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="300"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="302"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_settings_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_settings_label&quot;>Settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="301"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="303"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_time_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_time_label&quot;>Time&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="302"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="306"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="304"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="304"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_user_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_user_label&quot;>Me&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="303"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="305"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_user_new_user` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_user_new_user&quot;>New user&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="733"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="305"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="307"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_wifi_not_connected` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_wifi_not_connected&quot;>Not Connected&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="317"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="307"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="309"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_wifi_no_network` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_wifi_no_network&quot;>No Network&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="739"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="308"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="310"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_wifi_off_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_wifi_off_label&quot;>Wi-Fi Off&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="741"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="319"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="317"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="317"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="309"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="315"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="317"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="317"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="317"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="317"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="313"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="311"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="311"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_wifi_on_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_wifi_on_label&quot;>Wi-Fi On&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="743"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="310"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="314"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="312"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="312"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_cast_device_default_description` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_cast_device_default_description&quot;>Ready to cast&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="755"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="326"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="324"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="324"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="322"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="322"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="322"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="316"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="322"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="322"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="324"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="324"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="324"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="324"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="320"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="318"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="318"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_brightness_dialog_auto_brightness_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_brightness_dialog_auto_brightness_label&quot;>AUTO&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="761"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="319"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="321"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_color_space_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_color_space_label&quot;>Color correction mode&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="765"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="321"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="325"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="323"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="323"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_tethering_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_tethering_label&quot;>Tethering&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="777"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="335"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="335"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="333"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="333"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="333"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="327"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="333"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="333"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="335"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="335"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="335"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="335"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="331"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="329"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="329"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_notifications_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_notifications_label&quot;>Notifications&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="791"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="349"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="340"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="345"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="340"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="345"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="341"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="340"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="343"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="343"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="340"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="335"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="343"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="342"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="345"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="345"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="345"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="340"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="345"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="339"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="337"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="337"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.recents_search_bar_label` appears to be unused"
+        errorLine1="    &lt;string name=&quot;recents_search_bar_label&quot;>search&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="371"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="362"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="362"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="363"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="362"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="365"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="365"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="362"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="357"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="365"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="364"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="362"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="361"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="359"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="359"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.recents_multistack_add_stack_dialog_split_horizontal` appears to be unused"
+        errorLine1="    &lt;string name=&quot;recents_multistack_add_stack_dialog_split_horizontal&quot;>Split Horizontal&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="855"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="372"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="372"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="364"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="372"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="371"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="366"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.recents_multistack_add_stack_dialog_split_vertical` appears to be unused"
+        errorLine1="    &lt;string name=&quot;recents_multistack_add_stack_dialog_split_vertical&quot;>Split Vertical&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="857"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="371"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="365"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="372"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="369"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="367"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="367"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.recents_multistack_add_stack_dialog_split_custom` appears to be unused"
+        errorLine1="    &lt;string name=&quot;recents_multistack_add_stack_dialog_split_custom&quot;>Split Custom&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="859"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="371"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="371"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="372"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="371"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="371"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="366"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="371"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="370"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="368"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="368"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.expanded_header_battery_charged` appears to be unused"
+        errorLine1="    &lt;string name=&quot;expanded_header_battery_charged&quot;>Charged&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="871"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="371"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="373"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.expanded_header_battery_charging` appears to be unused"
+        errorLine1="    &lt;string name=&quot;expanded_header_battery_charging&quot;>Charging&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="874"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="372"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="374"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.expanded_header_battery_charging_with_time` appears to be unused"
+        errorLine1="    &lt;string name=&quot;expanded_header_battery_charging_with_time&quot;>&lt;xliff:g id=&quot;charging_time&quot; example=&quot;2 hrs 25 min&quot;>%s&lt;/xliff:g> until full&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="877"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="373"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="375"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.expanded_header_battery_not_charging` appears to be unused"
+        errorLine1="    &lt;string name=&quot;expanded_header_battery_not_charging&quot;>Not charging&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="880"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="374"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="376"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.ssl_ca_cert_warning` appears to be unused"
+        errorLine1="    &lt;string name=&quot;ssl_ca_cert_warning&quot;>Network may\nbe monitored&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="886"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="375"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="377"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.description_target_search` appears to be unused"
+        errorLine1="    &lt;string name=&quot;description_target_search&quot;>Search&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="889"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="390"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="376"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="378"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.description_direction_up` appears to be unused"
+        errorLine1="    &lt;string name=&quot;description_direction_up&quot;>Slide up for &lt;xliff:g id=&quot;target_description&quot; example=&quot;Unlock&quot;>%s&lt;/xliff:g>.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="891"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="391"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="377"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="381"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="379"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="379"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.description_direction_left` appears to be unused"
+        errorLine1="    &lt;string name=&quot;description_direction_left&quot;>&quot;Slide left for &lt;xliff:g id=&quot;target_description&quot; example=&quot;Unlock&quot;>%s&lt;/xliff:g>.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="893"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="392"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="378"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="383"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="382"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="380"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="380"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.keyguard_more_overflow_text` appears to be unused"
+        errorLine1="    &lt;string name=&quot;keyguard_more_overflow_text&quot;>+&lt;xliff:g id=&quot;number_of_notifications&quot; example=&quot;5&quot;>%d&lt;/xliff:g>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="911"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="398"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="394"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="394"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="390"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="392"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="392"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="384"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="392"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="391"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="394"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="394"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="394"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="394"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="388"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="386"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="386"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.speed_bump_explanation` appears to be unused"
+        errorLine1="    &lt;string name=&quot;speed_bump_explanation&quot;>Less urgent notifications below&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="914"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="399"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="390"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="395"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="390"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="395"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="391"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="390"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="393"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="393"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="390"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="385"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="393"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="392"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="395"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="395"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="395"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="390"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="395"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="389"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="387"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="387"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_multi_user_switch_switcher` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_multi_user_switch_switcher&quot;>Switch user&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="970"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="417"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="403"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="405"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_multi_user_switch_switcher_with_current` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_multi_user_switch_switcher_with_current&quot;>Switch user, current user &lt;xliff:g id=&quot;current_user_name&quot; example=&quot;John Doe&quot;>%s&lt;/xliff:g>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="973"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="418"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="414"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="414"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="412"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="412"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="404"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="412"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="414"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="414"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="414"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="414"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="406"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_multi_user_switch_inactive` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_multi_user_switch_inactive&quot;>Current user &lt;xliff:g id=&quot;current_user_name&quot; example=&quot;John Doe&quot;>%s&lt;/xliff:g>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="976"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="419"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="415"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="415"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="405"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="412"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="415"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="415"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="415"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="415"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="409"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="407"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="407"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_multi_user_switch_quick_contact` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_multi_user_switch_quick_contact&quot;>Show profile&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="979"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="420"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="416"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="416"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="412"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="414"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="414"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="406"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="414"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="413"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="416"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="416"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="416"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="411"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="416"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="410"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="408"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="408"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.guest_notification_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;guest_notification_title&quot;>Guest user&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1018"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="433"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="419"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="421"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.guest_notification_text` appears to be unused"
+        errorLine1="    &lt;string name=&quot;guest_notification_text&quot;>To delete apps and data, remove guest user&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1021"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="434"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="420"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="422"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.guest_notification_remove_action` appears to be unused"
+        errorLine1="    &lt;string name=&quot;guest_notification_remove_action&quot;>REMOVE GUEST&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1024"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="421"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="423"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.user_logout_notification_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;user_logout_notification_title&quot;>Logout user&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1027"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="432"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="432"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="422"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="432"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="432"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="432"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="432"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="424"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.user_logout_notification_text` appears to be unused"
+        errorLine1="    &lt;string name=&quot;user_logout_notification_text&quot;>Logout current user&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1030"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="433"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="433"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="423"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="433"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="433"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="433"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="433"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="427"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="425"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="425"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.user_logout_notification_action` appears to be unused"
+        errorLine1="    &lt;string name=&quot;user_logout_notification_action&quot;>LOGOUT USER&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1033"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="434"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="434"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="430"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="432"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="432"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="424"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="432"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="431"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="434"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="434"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="434"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="429"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="434"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="428"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="426"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="426"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_saver_notification_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_saver_notification_title&quot;>Battery Saver is on&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1060"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="441"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="441"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="433"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="441"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="440"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="435"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_saver_notification_text` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_saver_notification_text&quot;>Reduces performance and background data&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1063"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="444"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="444"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="440"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="442"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="442"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="434"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="442"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="441"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="444"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="444"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="444"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="444"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="438"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="436"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="436"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_saver_notification_action_text` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_saver_notification_action_text&quot;>Turn off Battery Saver&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1066"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="440"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="440"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="441"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="440"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="440"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="435"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="442"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="440"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="439"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="437"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="437"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.profile_owned_footer` appears to be unused"
+        errorLine1="    &lt;string name=&quot;profile_owned_footer&quot;>Profile may be monitored&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1090"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="457"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="453"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="453"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="451"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="451"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="443"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="451"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="450"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="453"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="453"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="453"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="453"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="445"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.vpn_footer` appears to be unused"
+        errorLine1="    &lt;string name=&quot;vpn_footer&quot;>Network may be monitored&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1093"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="458"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="454"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="454"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="450"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="452"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="452"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="444"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="452"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="451"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="454"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="454"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="454"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="454"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="448"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="446"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="446"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.branded_vpn_footer` appears to be unused"
+        errorLine1="    &lt;string name=&quot;branded_vpn_footer&quot;>Network may be monitored&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1096"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="459"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="450"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="455"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="450"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="455"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="451"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="450"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="453"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="453"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="450"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="445"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="453"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="452"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="455"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="455"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="455"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="450"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="455"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="449"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="447"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="447"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_title_profile_owned` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_title_profile_owned&quot;>Profile monitoring&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1147"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="476"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="467"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="467"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="468"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="467"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="467"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="462"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="467"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="466"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="464"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="464"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.disable_vpn` appears to be unused"
+        errorLine1="    &lt;string name=&quot;disable_vpn&quot;>Disable VPN&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1163"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="481"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="477"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="477"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="473"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="475"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="475"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="467"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="475"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="474"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="477"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="477"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="477"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="477"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="471"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="469"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="469"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.disconnect_vpn` appears to be unused"
+        errorLine1="    &lt;string name=&quot;disconnect_vpn&quot;>Disconnect VPN&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1166"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="473"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="478"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="473"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="478"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="474"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="473"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="476"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="476"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="473"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="468"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="476"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="475"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="478"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="478"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="478"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="473"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="478"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="472"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="470"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="470"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_do_header_generic` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_do_header_generic&quot;>Your device is managed by &lt;xliff:g id=&quot;device_owner_app&quot; example=&quot;Google Mobile Management&quot;>%1$s&lt;/xliff:g>.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1202"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="480"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="482"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_do_header_with_name` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_do_header_with_name&quot;>&lt;xliff:g id=&quot;organization_name&quot; example=&quot;Foo, Inc.&quot;>%1$s&lt;/xliff:g> uses &lt;xliff:g id=&quot;device_owner_app&quot; example=&quot;Google Mobile Management&quot;>%2$s&lt;/xliff:g> to manage your device.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1205"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="481"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="483"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_do_body` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_do_body&quot;>Your admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\&apos;s location information.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1208"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="482"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="484"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_do_learn_more_separator` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_do_learn_more_separator&quot;>&quot; &quot;&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1211"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="483"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="485"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_do_learn_more` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_do_learn_more&quot;>Learn more&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1214"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="484"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="486"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="486"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_do_body_vpn` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_do_body_vpn&quot;>You\&apos;re connected to &lt;xliff:g id=&quot;vpn_app&quot;>%1$s&lt;/xliff:g>, which can monitor your network activity, including emails, apps, and websites.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1217"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="485"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="487"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="487"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_ca_cert_settings_separator` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_ca_cert_settings_separator&quot;>&quot; &quot;&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1226"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="488"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="490"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_ca_cert_settings` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_ca_cert_settings&quot;>Open trusted credentials&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1229"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="489"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="491"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_network_logging` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_network_logging&quot;>Your admin has turned on network logging, which monitors traffic on your device.\n\nFor more information, contact your admin.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1232"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="490"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="492"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_vpn` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_vpn&quot;>You gave an app permission to set up a VPN connection.\n\nThis app can monitor your device and network activity, including emails, apps, and websites.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1235"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="491"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="493"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="493"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_vpn_profile_owned` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_vpn_profile_owned&quot;>Your work profile is managed by &lt;xliff:g id=&quot;organization&quot;>%1$s&lt;/xliff:g>.\n\nYour admin is capable of monitoring your network activity including emails, apps, and websites.\n\nFor more information, contact your admin.\n\nYou\&apos;re also connected to a VPN, which can monitor your network activity.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1238"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="492"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="494"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_app` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_app&quot;>You\&apos;re connected to"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1244"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="494"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="496"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_app_personal` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_app_personal&quot;>You\&apos;re connected to &lt;xliff:g id=&quot;application&quot;>%1$s&lt;/xliff:g>, which can monitor your personal network activity, including emails, apps, and websites.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1249"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="495"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="497"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.branded_monitoring_description_app_personal` appears to be unused"
+        errorLine1="    &lt;string name=&quot;branded_monitoring_description_app_personal&quot;>You\&apos;re connected to &lt;xliff:g id=&quot;application&quot;>%1$s&lt;/xliff:g>, which can monitor your personal network activity, including emails, apps, and websites.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1252"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="496"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="498"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_app_work` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_app_work&quot;>Your work profile is managed by"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1255"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="497"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="499"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.monitoring_description_app_personal_work` appears to be unused"
+        errorLine1="    &lt;string name=&quot;monitoring_description_app_personal_work&quot;>Your work profile is managed by"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1261"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="498"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="500"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.keyguard_indication_trust_granted` appears to be unused"
+        errorLine1="    &lt;string name=&quot;keyguard_indication_trust_granted&quot;>Unlocked for &lt;xliff:g id=&quot;user_name&quot; example=&quot;John Doe&quot;>%1$s&lt;/xliff:g>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1269"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="499"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="501"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="501"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.keyguard_indication_trust_managed` appears to be unused"
+        errorLine1="    &lt;string name=&quot;keyguard_indication_trust_managed&quot;>&lt;xliff:g id=&quot;trust_agent&quot; example=&quot;Smart Lock&quot;>%1$s&lt;/xliff:g> is running&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1272"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="500"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="502"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.hidden_notifications_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;hidden_notifications_title&quot;>Get notifications faster&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1278"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="516"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="502"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="504"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.hidden_notifications_text` appears to be unused"
+        errorLine1="    &lt;string name=&quot;hidden_notifications_text&quot;>See them before you unlock&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1281"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="503"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="505"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.hidden_notifications_cancel` appears to be unused"
+        errorLine1="    &lt;string name=&quot;hidden_notifications_cancel&quot;>No thanks&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1284"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="518"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="504"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="508"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="506"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="506"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.hidden_notifications_setup` appears to be unused"
+        errorLine1="    &lt;string name=&quot;hidden_notifications_setup&quot;>Set up&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1287"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="505"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="507"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.volume_zen_end_now` appears to be unused"
+        errorLine1="    &lt;string name=&quot;volume_zen_end_now&quot;>Turn off now&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1293"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="521"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="507"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="509"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_volume_expand` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_volume_expand&quot;>Expand&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1299"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="523"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="509"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="516"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="511"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_volume_collapse` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_volume_collapse&quot;>Collapse&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1302"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="524"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="520"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="520"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="516"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="518"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="518"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="510"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="518"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="520"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="520"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="520"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="520"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="514"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="512"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="512"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_output_chooser` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_output_chooser&quot;>Switch output device&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1305"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="516"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="521"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="516"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="521"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="517"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="516"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="516"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="511"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="519"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="518"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="521"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="521"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="521"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="516"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="521"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="515"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="513"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="513"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_reset_confirmation_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_reset_confirmation_title&quot;>Hide &lt;xliff:g id=&quot;tile_label&quot; example=&quot;Hotspot&quot;>%1$s&lt;/xliff:g>?&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1330"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="531"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="531"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="523"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="531"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="530"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="525"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_reset_confirmation_message` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_reset_confirmation_message&quot;>It will reappear the next time you turn it on in settings.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1333"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="538"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="534"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="534"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="530"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="532"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="532"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="524"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="532"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="531"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="534"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="534"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="534"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="534"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="528"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="526"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="526"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings_reset_confirmation_button` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings_reset_confirmation_button&quot;>Hide&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1336"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="530"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="535"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="530"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="535"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="531"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="530"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="530"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="525"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="533"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="532"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="535"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="535"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="535"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="530"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="535"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="529"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="527"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="527"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.ring_toggle_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;ring_toggle_title&quot;>Calls&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1351"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="549"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="540"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="545"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="540"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="545"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="541"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="540"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="543"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="543"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="540"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="535"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="543"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="542"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="545"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="545"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="545"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="540"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="545"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="539"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="537"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="537"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.volume_stream_muted` appears to be unused"
+        errorLine1="    &lt;string name=&quot;volume_stream_muted&quot; translatable=&quot;false&quot;>%s silent&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1361"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.volume_stream_vibrate` appears to be unused"
+        errorLine1="    &lt;string name=&quot;volume_stream_vibrate&quot; translatable=&quot;false&quot;>%s vibrate&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1362"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.volume_stream_suppressed` appears to be unused"
+        errorLine1="    &lt;string name=&quot;volume_stream_suppressed&quot; translatable=&quot;false&quot;>%1$s silent — %2$s&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1363"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.volume_stream_muted_dnd` appears to be unused"
+        errorLine1="    &lt;string name=&quot;volume_stream_muted_dnd&quot; translatable=&quot;false&quot;>%s silent — Total silence&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1364"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.volume_stream_limited_dnd` appears to be unused"
+        errorLine1="    &lt;string name=&quot;volume_stream_limited_dnd&quot; translatable=&quot;false&quot;>%s — Priority only&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1365"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.volume_stream_vibrate_dnd` appears to be unused"
+        errorLine1="    &lt;string name=&quot;volume_stream_vibrate_dnd&quot; translatable=&quot;false&quot;>%s vibrate — Priority only&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1366"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.output_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;output_title&quot;>Media output&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1385"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="551"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="553"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.output_calls_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;output_calls_title&quot;>Phone call output&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1386"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="552"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="554"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.output_none_found` appears to be unused"
+        errorLine1="    &lt;string name=&quot;output_none_found&quot;>No devices found&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1387"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="553"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="555"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.output_none_found_service_off` appears to be unused"
+        errorLine1="    &lt;string name=&quot;output_none_found_service_off&quot;>No devices found. Try turning on &lt;xliff:g id=&quot;service&quot; example=&quot;Bluetooth&quot;>%1$s&lt;/xliff:g>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1388"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="554"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="556"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.output_service_bt` appears to be unused"
+        errorLine1="    &lt;string name=&quot;output_service_bt&quot;>Bluetooth&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1389"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="555"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="557"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.output_service_wifi` appears to be unused"
+        errorLine1="    &lt;string name=&quot;output_service_wifi&quot;>Wi-Fi&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1390"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="570"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="556"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="558"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="558"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.output_service_bt_wifi` appears to be unused"
+        errorLine1="    &lt;string name=&quot;output_service_bt_wifi&quot;>Bluetooth and Wi-Fi&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1391"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="557"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="559"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.show_battery_percentage` appears to be unused"
+        errorLine1="    &lt;string name=&quot;show_battery_percentage&quot;>Show embedded battery percentage&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1397"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="559"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="561"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.show_battery_percentage_summary` appears to be unused"
+        errorLine1="    &lt;string name=&quot;show_battery_percentage_summary&quot;>Show battery level percentage inside the status bar icon when not charging&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1400"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="570"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="570"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="560"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="570"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="570"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="570"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="570"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="564"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="562"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="562"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.quick_settings` appears to be unused"
+        errorLine1="    &lt;string name=&quot;quick_settings&quot;>Quick Settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1403"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="561"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="566"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="563"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.overview` appears to be unused"
+        errorLine1="    &lt;string name=&quot;overview&quot;>Overview&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1409"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="577"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="570"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="569"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="563"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="570"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="568"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="567"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="565"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="565"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.add_tile` appears to be unused"
+        errorLine1="    &lt;string name=&quot;add_tile&quot;>Add tile&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1433"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="585"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="581"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="578"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="581"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="577"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="579"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="579"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="571"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="579"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="578"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="581"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="581"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="581"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="581"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="575"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="573"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="573"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.broadcast_tile` appears to be unused"
+        errorLine1="    &lt;string name=&quot;broadcast_tile&quot;>Broadcast Tile&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1436"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="586"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="577"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="582"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="579"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="582"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="578"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="577"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="580"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="580"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="577"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="572"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="580"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="579"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="582"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="582"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="582"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="577"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="582"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="576"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="574"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="574"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.regrettable_lack_of_easter_egg` appears to be unused"
+        errorLine1="    &lt;string name=&quot;regrettable_lack_of_easter_egg&quot;>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1439"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.activity_not_found` appears to be unused"
+        errorLine1="    &lt;string name=&quot;activity_not_found&quot;>Application is not installed on your device&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1486"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="587"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="589"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.clock_seconds` appears to be unused"
+        errorLine1="    &lt;string name=&quot;clock_seconds&quot;>Show clock seconds&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1489"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="588"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="590"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.clock_seconds_desc` appears to be unused"
+        errorLine1="    &lt;string name=&quot;clock_seconds_desc&quot;>Show clock seconds in the status bar. May impact battery life.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1491"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="589"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="591"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.qs_rearrange` appears to be unused"
+        errorLine1="    &lt;string name=&quot;qs_rearrange&quot;>Rearrange Quick Settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1494"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="590"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="592"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.show_brightness` appears to be unused"
+        errorLine1="    &lt;string name=&quot;show_brightness&quot;>Show brightness in Quick Settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1496"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="591"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="595"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="593"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="593"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.qs_paging` appears to be unused"
+        errorLine1="    &lt;string name=&quot;qs_paging&quot; translatable=&quot;false&quot;>Use the new Quick Settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1498"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.experimental` appears to be unused"
+        errorLine1="    &lt;string name=&quot;experimental&quot;>Experimental&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1502"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="592"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="594"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="594"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.qs_customize` appears to be unused"
+        errorLine1="    &lt;string name=&quot;qs_customize&quot; translatable=&quot;false&quot;>Allow long-press customize in Quick Settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1504"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.qs_customize_info` appears to be unused"
+        errorLine1="    &lt;string name=&quot;qs_customize_info&quot; translatable=&quot;false&quot;>Info&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1505"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.qs_customize_remove` appears to be unused"
+        errorLine1="    &lt;string name=&quot;qs_customize_remove&quot; translatable=&quot;false&quot;>Remove&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1506"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.no_tiles_add` appears to be unused"
+        errorLine1="    &lt;string name=&quot;no_tiles_add&quot; translatable=&quot;false&quot;>No tiles to add&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1507"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.show_silently` appears to be unused"
+        errorLine1="    &lt;string name=&quot;show_silently&quot;>Show notifications silently&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1520"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="610"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="596"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="598"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.block` appears to be unused"
+        errorLine1="    &lt;string name=&quot;block&quot;>Block all notifications&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1522"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="611"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="597"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="599"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.do_not_silence` appears to be unused"
+        errorLine1="    &lt;string name=&quot;do_not_silence&quot;>Don\&apos;t silence&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1524"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="598"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="600"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="600"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.do_not_silence_block` appears to be unused"
+        errorLine1="    &lt;string name=&quot;do_not_silence_block&quot;>Don\&apos;t silence or block&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1526"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="613"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="599"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="601"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.tuner_full_importance_settings_on` appears to be unused"
+        errorLine1="    &lt;string name=&quot;tuner_full_importance_settings_on&quot;>On&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1530"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="615"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="611"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="611"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="601"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="611"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="611"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="611"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="611"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="605"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="603"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="603"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.tuner_full_importance_settings_off` appears to be unused"
+        errorLine1="    &lt;string name=&quot;tuner_full_importance_settings_off&quot;>Off&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1531"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="616"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="610"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="610"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="602"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="610"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="607"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="604"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.notification_header_default_channel` appears to be unused"
+        errorLine1="    &lt;string name=&quot;notification_header_default_channel&quot;>Notifications&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1558"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="618"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="614"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="611"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="614"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="610"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="604"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="612"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="611"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="614"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="614"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="614"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="609"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="614"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="608"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="606"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="606"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.notification_channel_switch_accessibility` appears to be unused"
+        errorLine1="    &lt;string name=&quot;notification_channel_switch_accessibility&quot;>Allow notifications from this channel&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1614"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="639"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="635"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="635"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="631"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="633"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="633"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="625"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="633"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="635"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="635"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="635"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="635"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="629"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="627"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="627"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.notification_done` appears to be unused"
+        errorLine1="    &lt;string name=&quot;notification_done&quot;>Done&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1622"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="642"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="633"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="638"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="635"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="638"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="634"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="633"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="636"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="636"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="633"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="628"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="636"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="635"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="638"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="638"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="638"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="633"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="638"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="632"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="630"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="630"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_panel_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_panel_title&quot;>Battery usage&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1660"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="666"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="658"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="653"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="658"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="650"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="656"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="656"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="644"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="656"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="653"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="658"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="658"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="658"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="658"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="648"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="646"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="646"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_detail_charging_summary` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_detail_charging_summary&quot;>Battery Saver not available during charging&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1663"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="667"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="652"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="654"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="652"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="657"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="657"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="652"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="645"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="657"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="654"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="652"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="647"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.battery_detail_switch_summary` appears to be unused"
+        errorLine1="    &lt;string name=&quot;battery_detail_switch_summary&quot;>Reduces performance and background data&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1669"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="669"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="654"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="661"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="656"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="661"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="653"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="654"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="654"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="647"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="659"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="656"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="661"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="661"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="661"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="654"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="661"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="651"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="649"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="649"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.keyboard_shortcut_group_applications_youtube` appears to be unused"
+        errorLine1="    &lt;string name=&quot;keyboard_shortcut_group_applications_youtube&quot;>YouTube&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1754"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="710"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="700"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="700"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="688"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="700"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="690"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.tuner_full_zen_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;tuner_full_zen_title&quot;>Show with volume controls&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1759"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="712"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="696"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="690"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="694"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="692"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="692"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.volume_up_silent` appears to be unused"
+        errorLine1="    &lt;string name=&quot;volume_up_silent&quot;>Exit do not disturb on volume up&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1769"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="715"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="700"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="700"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="705"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="705"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="700"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="693"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="705"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="700"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="695"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.clock` appears to be unused"
+        errorLine1="    &lt;string name=&quot;clock&quot;>Clock&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1775"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="717"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="701"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="695"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="707"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="699"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="697"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="697"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_data_saver_off` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_data_saver_off&quot;>Data Saver is off&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1797"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="708"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="714"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="714"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="702"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="714"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="706"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="704"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="704"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.nav_bar_default` appears to be unused"
+        errorLine1="    &lt;string name=&quot;nav_bar_default&quot;> (default)&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1819"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="731"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="723"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="718"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="723"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="715"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="721"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="721"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="709"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="721"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="718"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="723"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="723"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="723"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="716"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="723"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="713"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="711"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="711"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.menu_ime` appears to be unused"
+        errorLine1="    &lt;string name=&quot;menu_ime&quot;>Keyboard switcher&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1851"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="744"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="736"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="731"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="736"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="728"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="734"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="734"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="722"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="734"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="731"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="736"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="736"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="736"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="736"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="726"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="724"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="724"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.save` appears to be unused"
+        errorLine1="    &lt;string name=&quot;save&quot;>Save&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1853"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="745"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="730"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="732"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="730"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="735"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="735"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="730"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="723"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="735"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="732"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="730"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="725"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.adjust_button_width` appears to be unused"
+        errorLine1="    &lt;string name=&quot;adjust_button_width&quot;>Adjust button width&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1858"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="747"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="732"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="739"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="734"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="739"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="731"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="732"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="732"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="725"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="737"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="734"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="739"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="739"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="739"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="732"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="739"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="729"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="727"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="727"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.accessibility_quick_settings_alarm_set` appears to be unused"
+        errorLine1="    &lt;string name=&quot;accessibility_quick_settings_alarm_set&quot;>Alarm set.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="1985"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="798"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="783"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="790"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="785"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="790"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="782"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="779"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="779"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="779"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="779"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="779"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="783"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="788"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="788"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="783"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="776"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="788"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="785"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="790"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="790"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="790"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="783"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="790"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="780"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="778"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="778"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.pip_phone_minimize` appears to be unused"
+        errorLine1="    &lt;string name=&quot;pip_phone_minimize&quot;>Minimize&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="2024"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="807"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="799"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="799"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="791"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="788"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="788"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="788"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="788"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="788"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="797"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="797"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="785"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="797"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="799"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="799"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="799"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="799"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="789"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="787"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="787"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.pip_notification_title` appears to be unused"
+        errorLine1="    &lt;string name=&quot;pip_notification_title&quot;>&lt;xliff:g id=&quot;name&quot; example=&quot;Google Maps&quot;>%s&lt;/xliff:g> is in picture-in-picture&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="2039"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="812"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="797"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="804"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="799"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="804"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="796"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="797"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="802"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="802"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="797"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="790"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="802"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="799"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="804"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="804"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="804"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="797"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="804"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="792"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="792"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.pip_notification_message` appears to be unused"
+        errorLine1="    &lt;string name=&quot;pip_notification_message&quot;>If you don\&apos;t want &lt;xliff:g id=&quot;name&quot; example=&quot;Google Maps&quot;>%s&lt;/xliff:g> to use this feature, tap to open settings and turn it off.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="2042"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="813"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="798"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="805"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="800"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="805"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="797"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="794"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="798"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="803"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="803"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="798"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="791"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="803"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="800"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="805"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="805"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="805"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="798"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="805"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="795"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="793"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="793"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.change_theme_reboot` appears to be unused"
+        errorLine1="    &lt;string name=&quot;change_theme_reboot&quot; translatable=&quot;false&quot;>Changing the theme requires a restart.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="2057"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.theme` appears to be unused"
+        errorLine1="    &lt;string name=&quot;theme&quot; translatable=&quot;false&quot;>Theme&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="2059"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.default_theme` appears to be unused"
+        errorLine1="    &lt;string name=&quot;default_theme&quot; translatable=&quot;false&quot;>Default&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="2061"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.qs_dnd_until` appears to be unused"
+        errorLine1="    &lt;string name=&quot;qs_dnd_until&quot;>Until &lt;xliff:g name=&quot;time&quot;>%s&lt;/xliff:g>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="2169"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="856"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="841"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="848"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="843"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="848"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="841"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="846"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="846"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="841"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="834"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="846"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="843"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="848"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="848"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="848"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="841"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="848"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="836"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.qs_dnd_keep` appears to be unused"
+        errorLine1="    &lt;string name=&quot;qs_dnd_keep&quot;>Keep&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="2172"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="857"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="842"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="849"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="844"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="849"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="841"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="842"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="847"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="847"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="842"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="835"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="847"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="844"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="849"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="849"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="849"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="842"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="849"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="837"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="837"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.qs_dnd_replace` appears to be unused"
+        errorLine1="    &lt;string name=&quot;qs_dnd_replace&quot;>Replace&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="2175"
+            column="13"/>
+        <location
+            file="res/values-af/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-am/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-ar/strings.xml"
+            line="858"
+            column="13"/>
+        <location
+            file="res/values-as/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-az/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-b+sr+Latn/strings.xml"
+            line="843"
+            column="13"/>
+        <location
+            file="res/values-be/strings.xml"
+            line="850"
+            column="13"/>
+        <location
+            file="res/values-bg/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-bn/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-bs/strings.xml"
+            line="845"
+            column="13"/>
+        <location
+            file="res/values-ca/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-cs/strings.xml"
+            line="850"
+            column="13"/>
+        <location
+            file="res/values-da/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-de/strings.xml"
+            line="842"
+            column="13"/>
+        <location
+            file="res/values-el/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="839"
+            column="13"/>
+        <location
+            file="res/values-es/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-es-rUS/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-et/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-eu/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-fa/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-fi/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-fr/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-fr-rCA/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-gl/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-gu/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-hi/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-hr/strings.xml"
+            line="843"
+            column="13"/>
+        <location
+            file="res/values-hu/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-hy/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-in/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-is/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-it/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-iw/strings.xml"
+            line="848"
+            column="13"/>
+        <location
+            file="res/values-ja/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-ka/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-kk/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-km/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-kn/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-ko/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-ky/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-lo/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-lt/strings.xml"
+            line="848"
+            column="13"/>
+        <location
+            file="res/values-lv/strings.xml"
+            line="843"
+            column="13"/>
+        <location
+            file="res/values-mk/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-ml/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-mn/strings.xml"
+            line="836"
+            column="13"/>
+        <location
+            file="res/values-mr/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-ms/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-my/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-nb/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-ne/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-nl/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-or/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-pa/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-pl/strings.xml"
+            line="848"
+            column="13"/>
+        <location
+            file="res/values-pt/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-pt-rBR/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-pt-rPT/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-ro/strings.xml"
+            line="845"
+            column="13"/>
+        <location
+            file="res/values-ru/strings.xml"
+            line="850"
+            column="13"/>
+        <location
+            file="res/values-si/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-sk/strings.xml"
+            line="850"
+            column="13"/>
+        <location
+            file="res/values-sl/strings.xml"
+            line="850"
+            column="13"/>
+        <location
+            file="res/values-sq/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-sr/strings.xml"
+            line="843"
+            column="13"/>
+        <location
+            file="res/values-sv/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-sw/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-ta/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-te/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-th/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-tl/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-tr/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-uk/strings.xml"
+            line="850"
+            column="13"/>
+        <location
+            file="res/values-ur/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-uz/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-vi/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-zh-rCN/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-zh-rHK/strings.xml"
+            line="840"
+            column="13"/>
+        <location
+            file="res/values-zh-rTW/strings.xml"
+            line="838"
+            column="13"/>
+        <location
+            file="res/values-zu/strings.xml"
+            line="838"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.style.SearchPanelCircle` appears to be unused"
+        errorLine1="    &lt;style name=&quot;SearchPanelCircle&quot;>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/styles.xml"
+            line="369"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.sun2` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/sun2.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.system_in` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/anim/system_in.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.anim.system_out` appears to be unused"
+        errorLine1="&lt;set xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/anim/system_out.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.layout.tuner_zen_mode_panel` appears to be unused"
+        errorLine1="&lt;com.android.systemui.tuner.TunerZenModePanel"
+        errorLine2="^">
+        <location
+            file="res/layout/tuner_zen_mode_panel.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.tv_pip_outline` appears to be unused"
+        errorLine1="&lt;shape xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/drawable/tv_pip_outline.xml"
+            line="17"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.volume_dialog_background` appears to be unused"
+        errorLine1="&lt;shape xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
+        errorLine2="^">
+        <location
+            file="res/drawable/volume_dialog_background.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UselessParent"
+        message="This `FrameLayout` layout or its `FrameLayout` parent is useless; transfer the `background` attribute to the other view"
+        errorLine1="    &lt;FrameLayout"
+        errorLine2="    ^">
+        <location
+            file="res/layout/brightness_mirror.xml"
+            line="24"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UselessParent"
+        message="This `FrameLayout` layout or its `FrameLayout` parent is possibly useless"
+        errorLine1="    &lt;FrameLayout"
+        errorLine2="    ^">
+        <location
+            file="res/layout-sw600dp/navigation_layout_rot90.xml"
+            line="22"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UnusedNamespace"
+        message="Unused namespace `systemui`"
+        errorLine1="    xmlns:systemui=&quot;http://schemas.android.com/apk/res/com.android.systemui&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/keyguard_bottom_area.xml"
+            line="20"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UnusedNamespace"
+        message="Unused namespace `systemui`"
+        errorLine1="    xmlns:systemui=&quot;http://schemas.android.com/apk/res/com.android.systemui&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar.xml"
+            line="23"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="TypographyEllipsis"
+        message="Replace &quot;...&quot; with ellipsis character (…, &amp;#8230;) ?"
+        errorLine1="    &lt;string name=&quot;quick_settings_connecting&quot;>Connecting...&lt;/string>"
+        errorLine2="                                             ^">
+        <location
+            file="res/values/strings.xml"
+            line="775"
+            column="46"/>
+    </issue>
+
+    <issue
+        id="TypographyQuotes"
+        message="Replace straight quotes (&quot;) with directional quotes (“”, &amp;#8220; and &amp;#8221;) ?"
+        errorLine1="    &lt;string name=&quot;pip_close&quot; msgid=&quot;3480680679023423574&quot;>&quot;\&quot;Кадр в кадре\&quot; – выйти&quot;&lt;/string>"
+        errorLine2="                                                         ^">
+        <location
+            file="res/values-ru/strings_tv.xml"
+            line="24"
+            column="58"/>
+    </issue>
+
+    <issue
+        id="IconDipSize"
+        message="The image `ic_sysbar_lights_out_dot_large.png` varies significantly in its density-independent (dip) size across the various density versions: drawable-mdpi/ic_sysbar_lights_out_dot_large.png: 10x9 dp (10x9 px), drawable-xhdpi/ic_sysbar_lights_out_dot_large.png: 8x6 dp (15x11 px), drawable-hdpi/ic_sysbar_lights_out_dot_large.png: 6x8 dp (9x12 px), drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png: 5x5 dp (15x16 px)">
+        <location
+            file="res/drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png"/>
+    </issue>
+
+    <issue
+        id="IconDipSize"
+        message="The image `ic_sysbar_lights_out_dot_large.png` varies significantly in its density-independent (dip) size across the various density versions: drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png: 11x8 dp (11x8 px), drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png: 9x8 dp (18x15 px), drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png: 7x8 dp (11x12 px), drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png: 6x7 dp (19x21 px)">
+        <location
+            file="res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png"/>
+        <location
+            file="res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png"/>
+    </issue>
+
+    <issue
+        id="IconDipSize"
+        message="The image `ic_sysbar_lights_out_dot_small.png` varies significantly in its density-independent (dip) size across the various density versions: drawable-mdpi/ic_sysbar_lights_out_dot_small.png: 8x9 dp (8x9 px), drawable-xhdpi/ic_sysbar_lights_out_dot_small.png: 6x7 dp (11x13 px), drawable-hdpi/ic_sysbar_lights_out_dot_small.png: 5x4 dp (7x6 px), drawable-xxhdpi/ic_sysbar_lights_out_dot_small.png: 4x4 dp (13x12 px)">
+        <location
+            file="res/drawable-xxhdpi/ic_sysbar_lights_out_dot_small.png"/>
+        <location
+            file="res/drawable-hdpi/ic_sysbar_lights_out_dot_small.png"/>
+        <location
+            file="res/drawable-xhdpi/ic_sysbar_lights_out_dot_small.png"/>
+        <location
+            file="res/drawable-mdpi/ic_sysbar_lights_out_dot_small.png"/>
+    </issue>
+
+    <issue
+        id="IconDensities"
+        message="Missing the following drawables in `drawable-hdpi`: recents_task_shadow.9.png, remote.png">
+        <location
+            file="res/drawable-hdpi"/>
+    </issue>
+
+    <issue
+        id="IconDensities"
+        message="Missing the following drawables in `drawable-mdpi`: recents_task_shadow.9.png, remote.png">
+        <location
+            file="res/drawable-mdpi"/>
+    </issue>
+
+    <issue
+        id="IconDensities"
+        message="Missing the following drawables in `drawable-xhdpi`: recents_task_shadow.9.png (found in drawable-xxhdpi)">
+        <location
+            file="res/drawable-xhdpi"/>
+    </issue>
+
+    <issue
+        id="IconDensities"
+        message="Missing the following drawables in `drawable-xxhdpi`: ic_cancel_white_24dp.png, ic_dismiss_outline.png, remote.png">
+        <location
+            file="res/drawable-xxhdpi"/>
+    </issue>
+
+    <issue
+        id="IconDensities"
+        message="Missing the following drawables in `drawable-xxxhdpi`: ic_cancel_white_24dp.png, ic_dismiss_outline.png, ic_notification_overlay.9.png, ic_qs_brightness_auto_off_alpha.png, ic_qs_brightness_auto_on_alpha.png... (10 more)">
+        <location
+            file="res/drawable-xxxhdpi"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/app_ops_info.xml"
+            line="39"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/assist_orb.xml"
+            line="38"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView android:id=&quot;@+id/user_avatar&quot;"
+        errorLine2="    ^">
+        <location
+            file="res/layout/car_fullscreen_user_pod.xml"
+            line="28"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/car_qs_footer.xml"
+            line="41"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/car_qs_footer.xml"
+            line="49"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/connected_device_signal.xml"
+            line="33"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/global_actions_item.xml"
+            line="31"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView android:id=&quot;@+id/global_screenshot_background&quot;"
+        errorLine2="    ^">
+        <location
+            file="res/layout/global_screenshot.xml"
+            line="19"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView android:id=&quot;@+id/global_screenshot&quot;"
+        errorLine2="    ^">
+        <location
+            file="res/layout/global_screenshot.xml"
+            line="24"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView android:id=&quot;@+id/global_screenshot_flash&quot;"
+        errorLine2="    ^">
+        <location
+            file="res/layout/global_screenshot.xml"
+            line="31"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/keyboard_shortcut_app_item.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="&lt;ImageView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/layout/keyboard_shortcuts_key_icon_view.xml"
+            line="18"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="            &lt;ImageView android:id=&quot;@+id/multi_user_avatar&quot;"
+        errorLine2="            ^">
+        <location
+            file="res/layout/keyguard_status_bar.xml"
+            line="50"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="            &lt;ImageView"
+        errorLine2="            ^">
+        <location
+            file="res/layout/mland.xml"
+            line="45"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageButton"
+        errorLine2="        ^">
+        <location
+            file="res/layout/mland.xml"
+            line="73"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageButton"
+        errorLine2="        ^">
+        <location
+            file="res/layout/mland.xml"
+            line="92"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/mobile_signal_group.xml"
+            line="31"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/mobile_signal_group.xml"
+            line="39"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/mobile_signal_group.xml"
+            line="48"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/nav_control_widget.xml"
+            line="28"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/nav_control_widget.xml"
+            line="41"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/nav_control_widget.xml"
+            line="54"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="&lt;ImageView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="res/layout/navigation_bar_app_item.xml"
+            line="21"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/notification_info.xml"
+            line="38"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/notification_snooze.xml"
+            line="42"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="&lt;ImageView"
+        errorLine2="^">
+        <location
+            file="res/layout/pip_menu_action.xml"
+            line="16"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/preference_widget_settings.xml"
+            line="36"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/qs_detail_header.xml"
+            line="47"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/qs_detail_item.xml"
+            line="27"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/qs_detail_items.xml"
+            line="42"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="                &lt;ImageView"
+        errorLine2="                ^">
+        <location
+            file="res/layout/qs_footer_impl.xml"
+            line="93"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView android:id=&quot;@+id/restricted_padlock&quot;"
+        errorLine2="        ^">
+        <location
+            file="res/layout/qs_tile_label.xml"
+            line="50"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/qs_tile_label.xml"
+            line="59"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/qs_user_detail_item.xml"
+            line="58"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/quick_settings_header_info.xml"
+            line="43"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/quick_settings_header_info.xml"
+            line="69"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/recents.xml"
+            line="37"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/recents_task_view_lock_to_app.xml"
+            line="29"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/rounded_corners.xml"
+            line="21"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/rounded_corners.xml"
+            line="28"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="48"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="55"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="65"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="91"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="98"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="108"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="134"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="141"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons.xml"
+            line="151"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="44"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="51"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="61"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="84"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="91"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="101"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="125"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="132"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="142"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="44"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="52"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="63"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="87"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="95"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="106"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="130"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="138"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="149"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView android:id=&quot;@+id/shelf_menu_anchor_anchor&quot;"
+        errorLine2="    ^">
+        <location
+            file="res/layout/shelf_menu_anchor.xml"
+            line="20"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="60"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="68"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="95"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="124"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/status_bar.xml"
+            line="34"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="            &lt;ImageView"
+        errorLine2="            ^">
+        <location
+            file="res/layout/status_bar_mobile_signal_group.xml"
+            line="39"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="            &lt;ImageView"
+        errorLine2="            ^">
+        <location
+            file="res/layout/status_bar_mobile_signal_group.xml"
+            line="47"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/status_bar_mobile_signal_group.xml"
+            line="56"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="            &lt;ImageView"
+        errorLine2="            ^">
+        <location
+            file="res/layout/status_bar_wifi_group.xml"
+            line="39"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="            &lt;ImageView"
+        errorLine2="            ^">
+        <location
+            file="res/layout/status_bar_wifi_group.xml"
+            line="47"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView android:id=&quot;@+id/backdrop_back&quot;"
+        errorLine2="        ^">
+        <location
+            file="res/layout/super_status_bar.xml"
+            line="35"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView android:id=&quot;@+id/backdrop_front&quot;"
+        errorLine2="        ^">
+        <location
+            file="res/layout/super_status_bar.xml"
+            line="39"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/tuner_shortcut_item.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/tuner_widget_settings_switch.xml"
+            line="24"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView android:id=&quot;@+id/button&quot;"
+        errorLine2="    ^">
+        <location
+            file="res/layout/tv_pip_control_button.xml"
+            line="23"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/volume_dnd_icon.xml"
+            line="23"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="    ^">
+        <location
+            file="res/layout/wireless_charging_layout.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="[Accessibility] Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/zen_mode_panel.xml"
+            line="136"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RelativeOverlap"
+        message="`@id/group_name` can overlap `@id/info` if @id/group_name grows due to localized text expansion"
+        errorLine1="        &lt;TextView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/notification_info.xml"
+            line="64"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RelativeOverlap"
+        message="`@id/undo` can overlap `@id/expand_button` if @string/snooze_undo grows due to localized text expansion"
+        errorLine1="        &lt;TextView"
+        errorLine2="        ^">
+        <location
+            file="res/layout/notification_snooze.xml"
+            line="51"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlCompat"
+        message="Inconsistent alignment specification between `textAlignment` and `gravity` attributes: was `fill_horizontal|center_vertical`, expected `start`"
+        errorLine1="        android:textAlignment=&quot;viewStart&quot; />"
+        errorLine2="                               ~~~~~~~~~">
+        <location
+            file="res/layout/foreground_service_item.xml"
+            line="46"
+            column="32"/>
+        <location
+            file="res/layout/foreground_service_item.xml"
+            line="42"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="RtlCompat"
+        message="Inconsistent alignment specification between `textAlignment` and `gravity` attributes: was `center_vertical`, expected `start`"
+        errorLine1="        android:textAlignment=&quot;viewStart&quot;"
+        errorLine2="                               ~~~~~~~~~">
+        <location
+            file="res/layout/heads_up_status_bar_layout.xml"
+            line="42"
+            column="32"/>
+        <location
+            file="res/layout/heads_up_status_bar_layout.xml"
+            line="45"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="RtlCompat"
+        message="Inconsistent alignment specification between `textAlignment` and `gravity` attributes: was `center_vertical`, expected `start`"
+        errorLine1="        android:textAlignment=&quot;viewStart&quot;"
+        errorLine2="                               ~~~~~~~~~">
+        <location
+            file="res/layout/switch_bar.xml"
+            line="38"
+            column="32"/>
+        <location
+            file="res/layout/switch_bar.xml"
+            line="32"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="        android:paddingStart=&quot;@dimen/battery_level_padding_start&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/battery_percentage_view.xml"
+            line="28"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
+        errorLine1="        android:paddingLeft=&quot;30dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_navigation_bar.xml"
+            line="33"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
+        errorLine1="        android:paddingLeft=&quot;30dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_navigation_bar_unprovisioned.xml"
+            line="33"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="        android:paddingStart=&quot;6dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/emergency_cryptkeeper_text.xml"
+            line="24"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="        android:paddingStart=&quot;6dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/heads_up_status_bar_layout.xml"
+            line="43"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="    android:paddingEnd=&quot;@dimen/group_overflow_number_padding&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/hybrid_overflow_number.xml"
+            line="23"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="            android:paddingEnd=&quot;12dp&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/keyboard_shortcut_app_item.xml"
+            line="40"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="            android:paddingEnd=&quot;@dimen/system_icons_keyguard_padding_end&quot; >"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/keyguard_status_bar.xml"
+            line="41"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="            android:paddingEnd=&quot;2dp&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/mobile_signal_group.xml"
+            line="37"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="            android:paddingEnd=&quot;2dp&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/mobile_signal_group.xml"
+            line="44"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="    android:paddingEnd=&quot;8dp&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_detail_buttons.xml"
+            line="20"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="            android:paddingStart=&quot;@dimen/qs_detail_header_text_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_detail_header.xml"
+            line="40"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="            android:paddingStart=&quot;16dp&quot;>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_footer_impl.xml"
+            line="49"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="56"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="65"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="96"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="106"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="137"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="147"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="58"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="68"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="101"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="111"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="144"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="153"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="    android:paddingEnd=&quot;@dimen/signal_cluster_battery_padding&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="27"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="        android:paddingEnd=&quot;6dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="33"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="            android:paddingEnd=&quot;2dp&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="66"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="            android:paddingEnd=&quot;2dp&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/signal_cluster_view.xml"
+            line="73"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="        android:paddingStart=&quot;8dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/slice_permission_request.xml"
+            line="31"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="        android:paddingStart=&quot;8dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/slice_permission_request.xml"
+            line="39"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="        android:paddingStart=&quot;@dimen/status_bar_padding_start&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar.xml"
+            line="38"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="                android:paddingEnd=&quot;2dp&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar_mobile_signal_group.xml"
+            line="45"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="                android:paddingEnd=&quot;2dp&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar_mobile_signal_group.xml"
+            line="52"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="                android:paddingEnd=&quot;2dp&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar_wifi_group.xml"
+            line="45"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="                android:paddingEnd=&quot;2dp&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/status_bar_wifi_group.xml"
+            line="52"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="        android:paddingStart=&quot;48dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/switch_bar.xml"
+            line="33"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
+        errorLine1="        android:paddingEnd=&quot;@dimen/signal_cluster_battery_padding&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/system_icons.xml"
+            line="27"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="        android:gravity=&quot;left&quot;"
+        errorLine2="                         ~~~~">
+        <location
+            file="res/layout/car_navigation_bar.xml"
+            line="32"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;30dp&quot;` to better support right-to-left layouts"
+        errorLine1="        android:paddingLeft=&quot;30dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_navigation_bar.xml"
+            line="33"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="        android:gravity=&quot;right&quot;"
+        errorLine2="                         ~~~~~">
+        <location
+            file="res/layout/car_navigation_bar.xml"
+            line="65"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Redundant attribute `paddingRight`; already defining `paddingEnd` with `targetSdkVersion` 28"
+        errorLine1="            android:paddingRight=&quot;20dp&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_navigation_bar.xml"
+            line="88"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="        android:gravity=&quot;left&quot;"
+        errorLine2="                         ~~~~">
+        <location
+            file="res/layout/car_navigation_bar_unprovisioned.xml"
+            line="32"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;30dp&quot;` to better support right-to-left layouts"
+        errorLine1="        android:paddingLeft=&quot;30dp&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/car_navigation_bar_unprovisioned.xml"
+            line="33"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="    android:layout_gravity=&quot;top|right&quot;"
+        errorLine2="                            ~~~~~~~~~">
+        <location
+            file="res/layout/global_actions_wrapped.xml"
+            line="6"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="        android:layout_gravity=&quot;top|right&quot;"
+        errorLine2="                                ~~~~~~~~~">
+        <location
+            file="res/layout/global_actions_wrapped.xml"
+            line="19"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="        android:layout_gravity=&quot;top|right&quot;"
+        errorLine2="                                ~~~~~~~~~">
+        <location
+            file="res/layout/global_actions_wrapped.xml"
+            line="30"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;@dimen/qs_detail_header_padding&quot;` to better support right-to-left layouts"
+        errorLine1="    android:paddingLeft=&quot;@dimen/qs_detail_header_padding&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_detail_header.xml"
+            line="21"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart=&quot;@dimen/restricted_padlock_pading&quot;` to better support right-to-left layouts"
+        errorLine1="            android:layout_marginLeft=&quot;@dimen/restricted_padlock_pading&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_tile_label.xml"
+            line="55"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart=&quot;@dimen/restricted_padlock_pading&quot;` to better support right-to-left layouts"
+        errorLine1="                android:layout_marginLeft=&quot;@dimen/restricted_padlock_pading&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/qs_user_detail_item.xml"
+            line="64"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="        android:layout_gravity=&quot;left|top&quot;"
+        errorLine2="                                ~~~~~~~~">
+        <location
+            file="res/layout/rounded_corners.xml"
+            line="25"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="        android:layout_gravity=&quot;right|bottom&quot;"
+        errorLine2="                                ~~~~~~~~~~~~">
+        <location
+            file="res/layout/rounded_corners.xml"
+            line="33"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;@dimen/screen_pinning_request_inner_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="56"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="65"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;@dimen/screen_pinning_request_inner_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="96"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="106"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;@dimen/screen_pinning_request_inner_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="137"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingLeft=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_land.xml"
+            line="147"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart=&quot;@dimen/screen_pinning_request_seascape_padding_negative&quot;` to better support right-to-left layouts"
+        errorLine1="            android:layout_marginLeft=&quot;@dimen/screen_pinning_request_seascape_padding_negative&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="49"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart=&quot;@dimen/screen_pinning_request_seascape_button_offset&quot;` to better support right-to-left layouts"
+        errorLine1="            android:layout_marginLeft=&quot;@dimen/screen_pinning_request_seascape_button_offset&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="57"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingRight` with `android:paddingEnd=&quot;@dimen/screen_pinning_request_inner_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="58"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingRight` with `android:paddingEnd=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="68"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart=&quot;@dimen/screen_pinning_request_seascape_padding_negative&quot;` to better support right-to-left layouts"
+        errorLine1="            android:layout_marginLeft=&quot;@dimen/screen_pinning_request_seascape_padding_negative&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="92"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart=&quot;@dimen/screen_pinning_request_seascape_button_offset&quot;` to better support right-to-left layouts"
+        errorLine1="            android:layout_marginLeft=&quot;@dimen/screen_pinning_request_seascape_button_offset&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="100"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingRight` with `android:paddingEnd=&quot;@dimen/screen_pinning_request_inner_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="101"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingRight` with `android:paddingEnd=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="111"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart=&quot;@dimen/screen_pinning_request_seascape_padding_negative&quot;` to better support right-to-left layouts"
+        errorLine1="            android:layout_marginLeft=&quot;@dimen/screen_pinning_request_seascape_padding_negative&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="135"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart=&quot;@dimen/screen_pinning_request_seascape_button_offset&quot;` to better support right-to-left layouts"
+        errorLine1="            android:layout_marginLeft=&quot;@dimen/screen_pinning_request_seascape_button_offset&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="143"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingRight` with `android:paddingEnd=&quot;@dimen/screen_pinning_request_inner_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_inner_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="144"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingRight` with `android:paddingEnd=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;` to better support right-to-left layouts"
+        errorLine1="            android:paddingRight=&quot;@dimen/screen_pinning_request_nav_icon_padding&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_buttons_sea.xml"
+            line="153"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="    android:gravity=&quot;right|center_vertical&quot;"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_land_phone.xml"
+            line="22"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="    android:gravity=&quot;left|center_vertical&quot;"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_pinning_request_sea_phone.xml"
+            line="22"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="        android:layout_gravity=&quot;center_vertical|right&quot;"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/volume_dialog.xml"
+            line="28"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingRight` with `android:paddingEnd=&quot;@dimen/volume_dialog_panel_transparent_padding_right&quot;` to better support right-to-left layouts"
+        errorLine1="        android:paddingRight=&quot;@dimen/volume_dialog_panel_transparent_padding_right&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/volume_dialog.xml"
+            line="30"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:paddingLeft` with `android:paddingStart=&quot;@dimen/volume_dialog_panel_transparent_padding&quot;` to better support right-to-left layouts"
+        errorLine1="        android:paddingLeft=&quot;@dimen/volume_dialog_panel_transparent_padding&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/volume_dialog.xml"
+            line="33"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="            android:layout_gravity=&quot;right&quot;"
+        errorLine2="                                    ~~~~~">
+        <location
+            file="res/layout/volume_dialog.xml"
+            line="43"
+            column="37"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Consider replacing `android:layout_marginRight` with `android:layout_marginEnd=&quot;@dimen/volume_dialog_stream_padding&quot;` to better support right-to-left layouts"
+        errorLine1="                     android:layout_marginRight=&quot;@dimen/volume_dialog_stream_padding&quot;"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/volume_dialog.xml"
+            line="59"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="RtlHardcoded"
+        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
+        errorLine1="        android:layout_gravity=&quot;right|top&quot;"
+        errorLine2="                                ~~~~~~~~~">
+        <location
+            file="res/layout/volume_dnd_icon.xml"
+            line="26"
+            column="33"/>
+    </issue>
+
+</issues>
diff --git a/packages/SystemUI/tools/lint/lint.xml b/packages/SystemUI/tools/lint/lint.xml
new file mode 100644
index 0000000..76773e8
--- /dev/null
+++ b/packages/SystemUI/tools/lint/lint.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+
+    <!-- Translations are done in separate CLs from source changes, so typically it's not actionable
+         by CL authors -->
+    <issue id="MissingTranslation" severity="ignore" />
+    <issue id="ExtraTranslation" severity="ignore" />
+
+    <!-- SystemUI is a priviledged app -->
+    <issue id="ProtectedPermissions" severity="ignore" />
+
+    <!-- SystemUI doesn't have launcher presence -->
+    <issue id="MissingApplicationIcon" severity="ignore" />
+
+    <!-- Make system inserts these attributes -->
+    <issue id="UsesMinSdkAttributes" severity="ignore" />
+    <issue id="MissingVersion" severity="ignore" />
+
+    <!-- Translation import automatically generates all of them -->
+    <issue id="UnusedQuantity" severity="ignore" />
+    <!-- This lint check misses the format used in TextUtils.expandTemplate (^1),
+         so it's not very useful (b/37128132) -->
+    <issue id="ImpliedQuantity" severity="ignore" />
+    <!-- SystemUI's SDK version is always latest so these are not relevant -->
+    <issue id="UnusedAttribute" severity="ignore" />
+    <issue id="NewApi" severity="ignore" />
+
+    <!-- We don't care about WebP for now (having a lint for optiPNG will be great though) -->
+    <issue id="ConvertToWebp" severity="ignore" />
+
+    <!-- b/37129369: MissingRegistered doesn't take libraries into account -->
+    <issue id="MissingRegistered" severity="ignore" />
+
+
+    <!-- We don't care about app indexing -->
+    <issue id="GoogleAppIndexingWarning" severity="ignore" />
+    <issue id="GoogleAppIndexingUrlError" severity="ignore" />
+
+    <!-- Issues under out/ typically comes from libraries -->
+    <issue id="ClickableViewAccessibility" severity="error">
+        <ignore regexp=".*/out/soong/.intermediates/frameworks/base/packages/SystemUI/SystemUI-core/android_common/combined/.*" />
+    </issue>
+
+    <!-- Turn on stop ship check -->
+    <issue id="StopShip" severity="warning" />
+
+
+    <issue id="UnusedResources" severity="error">
+        <!-- Nested script references are not picked up by lint -->
+        <ignore regexp="res/xml/wizard_script.*\.xml" />
+        <!-- Ignore translation files -->
+        <ignore regexp="res/values(-[a-zA-Z0-9]+)*-(\w\w|b+[a-zA-Z0-9+]+)(-[a-zA-Z0-9]+)*/strings.xml" />
+        <!-- Ignore translations arrays that are no longer used-->
+        <ignore regexp="res/values(-[a-zA-Z0-9]+)*-(\w\w|b+[a-zA-Z0-9+]+)(-[a-zA-Z0-9]+)*/arrays.xml" />
+    </issue>
+
+    <!-- Ignore translations when linting strings -->
+    <issue id="TypographyQuotes" severity="error">
+        <ignore regexp="res/values(-[a-zA-Z0-9]+)*-(\w\w|b+[a-zA-Z0-9+]+)(-[a-zA-Z0-9]+)*/strings.xml" />
+        <ignore regexp="res/values(-[a-zA-Z0-9]+)*-(\w\w|b+[a-zA-Z0-9+]+)(-[a-zA-Z0-9]+)*/arrays.xml" />
+    </issue>
+    <issue id="TypographyEllipsis" severity="error">
+        <ignore regexp="res/values(-[a-zA-Z0-9]+)*-(\w\w|b+[a-zA-Z0-9+]+)(-[a-zA-Z0-9]+)*/strings.xml" />
+        <ignore regexp="res/values(-[a-zA-Z0-9]+)*-(\w\w|b+[a-zA-Z0-9+]+)(-[a-zA-Z0-9]+)*/arrays.xml" />
+    </issue>
+    <issue id="TypographyDashes" severity="error">
+        <ignore regexp="res/values(-[a-zA-Z0-9]+)*-(\w\w|b+[a-zA-Z0-9+]+)(-[a-zA-Z0-9]+)*/strings.xml" />
+        <ignore regexp="res/values(-[a-zA-Z0-9]+)*-(\w\w|b+[a-zA-Z0-9+]+)(-[a-zA-Z0-9]+)*/arrays.xml" />
+    </issue>
+
+    <issue id="Wakelock" severity="error">
+        <ignore regexp=".*/out/soong/.intermediates/frameworks/base/packages/SystemUI/SystemUI-core/android_common/classes/android/support" />
+    </issue>
+
+    <issue id="InconsistentArrays" severity="ignore" />
+    <issue id="StringFormatCount" severity="ignore" />
+</lint>
diff --git a/packages/SystemUI/tools/lint/run_lint.sh b/packages/SystemUI/tools/lint/run_lint.sh
new file mode 100755
index 0000000..10d9e83
--- /dev/null
+++ b/packages/SystemUI/tools/lint/run_lint.sh
@@ -0,0 +1,59 @@
+#! /bin/bash
+
+if [[ $# -ne 2 ]]; then
+    echo "Error: Incorrect number of arguments" >&2
+    echo "Usage: ./run_lint.sh <repo_root> <CL_SHA>" >&2
+    exit 100
+fi
+
+git show --name-only --pretty=format: $2 | grep packages/SystemUI/ > /dev/null
+exitcode=$?
+if [[ exitcode -eq 1 ]];  then
+    exit 0
+fi
+
+if [[ -z $ANDROID_BUILD_TOP ]]; then
+    echo "Error: ANDROID_BUILD_TOP must be set" >&2
+    echo "Try setting up your environment first:" >&2
+    echo "    source build/envsetup.sh && lunch <target>" >&2
+    exit 101
+fi
+
+# TODO: Run lint as part of the build so we can specify the dependency properly
+systemuijarpath="out/soong/.intermediates/frameworks/base/packages/SystemUI/SystemUI-core/android_common/combined/SystemUI-core.jar"
+if [[ ! -f $ANDROID_BUILD_TOP/$systemuijarpath ]]; then
+    echo "Error: Classes.jar file not found" >&2
+    echo "Try building that jar file manually:" >&2
+    echo "    m -j16 out/soong/.intermediates/frameworks/base/packages/SystemUI/SystemUI-core/android_common/combined/SystemUI-core.jar" >&2
+    exit 102
+fi
+
+REPO_ROOT=$1
+${REPO_ROOT}/prebuilts/devtools/tools/lint \
+       . \
+       --exitcode \
+       -Werror \
+       --config ${REPO_ROOT}/frameworks/base/packages/SystemUI/tools/lint/lint.xml \
+       --html ${REPO_ROOT}/out/lint_output.html \
+       --baseline ${REPO_ROOT}/frameworks/base/packages/SystemUI/tools/lint/baseline.xml \
+       --remove-fixed
+exitcode=$?
+if [[ exitcode -eq 1 ]];  then
+    cat >&2 <<EOF
+
+Please check the HTML results file and fix the errors.
+If the error cannot be fixed immediately, there are 3 possible resolutions:
+1. Use tools:ignore or @SuppressLint annotation. This is preferred
+   for cases where the lint violation is intended, so that reviewers
+   can review whether the suppression is appropriate.
+2. Use tools/lint.xml to ignore a lint check which we don't care
+   about for any file, or checks that are not actionable by the
+   CL author (e.g. translation issues)
+3. If there are lint errors that should be fixed, but cannot be done
+   immediately for some reason, run ./tools/lint/update_baseline.sh to
+   add them to baseline.xml.
+
+EOF
+fi
+
+exit $exitcode
diff --git a/packages/SystemUI/tools/lint/update_baseline.sh b/packages/SystemUI/tools/lint/update_baseline.sh
new file mode 100755
index 0000000..aa0cd808
--- /dev/null
+++ b/packages/SystemUI/tools/lint/update_baseline.sh
@@ -0,0 +1,18 @@
+#! /bin/bash
+
+if [[ $PWD != *"/frameworks/base/packages/SystemUI" ]]; then
+    echo "Please run this in frameworks/base/packages/SystemUI" >&2
+    exit 1
+fi
+
+# Empty the baseline file so the baseline-generation run below do not ignore any existing errors.
+echo '' > tools/lint/baseline.xml
+
+lint . -Werror --exitcode --config tools/lint/lint.xml --html /tmp/lint_output.html \
+  --baseline tools/lint/baseline.xml --remove-fixed &
+
+# b/37579990 - The file needs to be removed *while* lint is running
+sleep 0.5
+rm tools/lint/baseline.xml
+
+wait
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-af/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-af/strings.xml
index 3eca94e..9811133 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-af/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-af/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Hoekskermuitsnede"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Hoekuitsnede"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-am/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-am/strings.xml
index b6c4de1..2626195 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-am/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-am/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"የማዕዘን ማሳያ ቅርጽ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"የማዕዘን ቅርጽ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ar/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ar/strings.xml
index 9517eb2..c01732d 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ar/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ar/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"صورة مقطوعة لشاشة جانبية"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"صورة مقطوعة جانبية"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-as/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-as/strings.xml
index 1ba9d7a0..361aa39 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-as/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-as/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"কৌণিক ডিছপ্লে কাটআউট"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"কৌণিক কাটআউট"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-az/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-az/strings.xml
index abb4247..4b089a4 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-az/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-az/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Künc ekran kəsimi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Künc kəsimi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-b+sr+Latn/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-b+sr+Latn/strings.xml
index 41dfd3a..5393410 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-b+sr+Latn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-b+sr+Latn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Izrezana slika u uglu ekrana"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Izrezana slika u uglu ekrana"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-be/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-be/strings.xml
index edd9e65..26c0b18 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-be/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-be/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Зрабіць выраз у кутку экрана"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Выраз у кутку"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bg/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bg/strings.xml
index 681a9b9..849bf57 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bg/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bg/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Ъглов прорез на екрана"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Ъглов прорез"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bn/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bn/strings.xml
deleted file mode 100644
index 194949d..0000000
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bn/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"কর্নার ডিসপ্লে কাট-আউট"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bs/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bs/strings.xml
index e79efe6..9ff0218a 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-bs/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Urez ekrana u uglu"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Urez u uglu"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ca/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ca/strings.xml
index 627ef24..3432502 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ca/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ca/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Retall de l\'extrem de la pantalla"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Retall de l\'extrem"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-cs/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-cs/strings.xml
index fd43995..7edff6f 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-cs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-cs/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Rohový výřez displeje"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Rohový výřez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-da/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-da/strings.xml
index ec27419..31b537c 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-da/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-da/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Udskæring i hjørnet af skærmen"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Hak i hjørnet"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-de/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-de/strings.xml
index da7c237..2e142ef 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-de/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-de/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Display-Ausschnitt in der Ecke"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Aussparung in der Ecke"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-el/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-el/strings.xml
index 460a8b6..0cf91dd 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-el/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-el/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Διακοπή γωνιακής οθόνης"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Γωνιακή εγκοπή"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rAU/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rAU/strings.xml
index 1058832..6923006 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rAU/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rAU/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Corner display cut out"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Corner cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rCA/strings.xml
index 1058832..6923006 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rCA/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Corner display cut out"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Corner cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rGB/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rGB/strings.xml
index 1058832..6923006 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rGB/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rGB/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Corner display cut out"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Corner cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rIN/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rIN/strings.xml
index 1058832..6923006 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rIN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rIN/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Corner display cut out"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Corner cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rXC/strings.xml
index bdd497a..1edef0b 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rXC/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎Corner display cutout‎‏‎‎‏‎"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎Corner cutout‎‏‎‎‏‎"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-es-rUS/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-es-rUS/strings.xml
index a4d8e64..6d41bc0 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-es-rUS/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-es-rUS/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Recorte de la esquina de la pantalla"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Corte de la esquina"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-es/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-es/strings.xml
index a4d8e64..d6d3a1e 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-es/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-es/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Recorte de la esquina de la pantalla"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Recorte de la esquina"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-et/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-et/strings.xml
index 1dec970..6626787 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-et/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-et/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Ekraani nurga väljalõige"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Nurga väljalõige"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-eu/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-eu/strings.xml
index a82e8ea..fd2f646 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-eu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-eu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Pantailaren izkinako mozketa"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Izkinako mozketa"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fa/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fa/strings.xml
index bfbaa5c..0d33978 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fa/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"نمایشگر با گوشه‌های بریده"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"نمایشگر با لبه بریده"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fi/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fi/strings.xml
index 4803b54..2acb982 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fi/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Aukko näytön kulmassa"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Nurkkalovi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fr-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fr-rCA/strings.xml
index 4110d51..ecf4e93 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fr-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fr-rCA/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Découpe d\'écran en coin"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Encoche de coin"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fr/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fr/strings.xml
index ff341a2..05c5c2b 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-fr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Encoche d\'angle pour écran"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Encoche d\'angle"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-gl/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-gl/strings.xml
index 7838d69..ae77dbd 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-gl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-gl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Recorte de pantalla na esquina"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Recorte na esquina"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-gu/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-gu/strings.xml
index 0680f7f..3c8c4e6 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-gu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-gu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"ખૂણાનું ડિસ્પ્લે કટઆઉટ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"કોર્નર કટઆઉટ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hi/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hi/strings.xml
deleted file mode 100644
index 01b8d69..0000000
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hi/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"कॉर्नर डिसप्ले कटआउट"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hr/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hr/strings.xml
index f8b2f79..e783abe 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Obrezana slika za kut zaslona"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Obrezana slika"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hu/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hu/strings.xml
index 7658edc..099267d 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Sarokban található képernyőkivágás"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Sarokkivágás"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hy/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hy/strings.xml
index 656ae24..7eb8803 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hy/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-hy/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Էկրանի անկյունի կտրվածք"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Անկյունի կտրվածք"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-in/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-in/strings.xml
index 78247f6..0dc0bfb 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-in/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-in/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Potongan tampilan sudut"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Potongan sudut"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-is/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-is/strings.xml
index 755360f..56ba1b9 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-is/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-is/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Hornskjáskurður"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Hornskurður"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-it/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-it/strings.xml
index 3eadd5f..b282437 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-it/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-it/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Ritaglio display angolo"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Ritaglio angolo"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-iw/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-iw/strings.xml
index bfb4797..1b46b50 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-iw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-iw/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"חיתוך פינות התצוגה"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"מגרעת בפינה"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ja/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ja/strings.xml
index fee2d70..4d8ee73 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ja/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ja/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"画面隅のディスプレイ カットアウト"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"画面隅のカットアウト"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ka/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ka/strings.xml
index 6cea242..a0b6aef 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ka/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ka/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"ეკრანის კუთხის ამოჭრა"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"კუთხის ამოჭრა"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-kk/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-kk/strings.xml
index a2a6948..0f4bc3a 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-kk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-kk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Экран бұрышындағы ойық"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Бұрышынан ойық жасау"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-km/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-km/strings.xml
index bbf23c6..feb66be 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-km/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-km/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"ស្នាម​ចោះ​ផ្ទាំង​អេក្រង់​នៅ​ជ្រុង"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"ស្នាមចោះ​នៅជ្រុង"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-kn/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-kn/strings.xml
index 7b9879a..50daf09 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-kn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-kn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"ಮೂಲೆಯ ಪ್ರದರ್ಶನ ಕಟೌಟ್"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"ಮೂಲೆಯ ಕಟೌಟ್"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ko/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ko/strings.xml
index 8fafcfa..e56d2d6 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ko/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ko/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"모서리 디스플레이 컷아웃"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"모서리 컷아웃"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ky/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ky/strings.xml
index 4d8c946..98499a1 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ky/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ky/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Бурчтагы дисплей кесиндиси"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Бурчтагы кесинди"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lo/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lo/strings.xml
index 257839d..833f20f 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lo/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lo/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"ແຜ່ນສະແດງມຸມ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"ຮອຍບາກມຸມ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lt/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lt/strings.xml
index e4b01ba..e257b8a 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lt/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Kampinė ekrano išpjova"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Kampinė išpjova"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lv/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lv/strings.xml
index 3087b63..a37d95c 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-lv/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Stūra ekrāna izgriezums"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Stūra izgriezums"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mk/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mk/strings.xml
index 2d0babf..9be5d7a 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Исечок на аголот на екранот"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Исечок на аголот"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ml/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ml/strings.xml
index 6adb3ec..a8baf40 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ml/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ml/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"കോർണർ ഡിസ്‌പ്ലേ കട്ടൗട്ട്"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"കോർണർ കട്ട്ഔട്ട്"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mn/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mn/strings.xml
index 7998f15..b49b481 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Булангийн дэлгэцийг таслах"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Булан гаргаж таслах"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mr/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mr/strings.xml
index a5d2133..435b664 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-mr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"कॉर्नर डिस्प्ले कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"कॉर्नर कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ms/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ms/strings.xml
index 9fccad6..94e2a23 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ms/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ms/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Potongan paparan penjuru"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Potongan penjuru"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-my/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-my/strings.xml
index c56ea8b..8228226 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-my/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-my/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"မျက်နှာပြင်ထောင့် ဖြတ်ညှပ်ပြသမှု"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"ထောင့် ဖြတ်ညှပ်ပြသမှု"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-nb/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-nb/strings.xml
index 731668f..1d61bf2 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-nb/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-nb/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Hjørneskjermutklipp"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Hjørneutklipp"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ne/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ne/strings.xml
index e024d2a..8765aeb 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ne/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ne/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"कुनाको प्रदर्शनसम्बन्धी कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"कुनाको कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-nl/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-nl/strings.xml
index 149041e..5c43d2e 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-nl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-nl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Hoekdisplay-cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Hoek-cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-or/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-or/strings.xml
index 620d36f..adaaaab 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-or/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-or/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"କର୍ନର୍ ଡିସ୍‌ପ୍ଲେ କଟଆଉଟ୍"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"କଣ ଫଳକ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pa/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pa/strings.xml
index 274e791..5b91ea9 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pa/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"ਕਿਨਾਰਿਆਂ ਤੱਕ ਜੁੜੀ ਡਿਸਪਲੇ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"ਕੋਨਾ ਕੱਟਆਊਟ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pl/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pl/strings.xml
index dd68d59..ef2714c 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Wycięcie w ekranie z narożnikami"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Wycięcie narożne"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt-rBR/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt-rBR/strings.xml
index ed7e2b5..2c800c2 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt-rBR/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt-rBR/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Corte de tela de canto"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Corte de canto"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt-rPT/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt-rPT/strings.xml
index e4ed794..a03955f 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt-rPT/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt-rPT/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Ecrã com recorte nos cantos"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Recorte nos cantos"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt/strings.xml
index ed7e2b5..2c800c2 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-pt/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Corte de tela de canto"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Corte de canto"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ro/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ro/strings.xml
index eebfe6a..28db495 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ro/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ro/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Decupare ecran pe colț"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Decupajul colțului"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ru/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ru/strings.xml
index fa8fefb..dc77981 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ru/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ru/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Сделать вырез в углу экрана"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Сделать вырез в углу"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-si/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-si/strings.xml
index ae833f2..bdecdf4 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-si/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-si/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"කොණ් තිර කට්අවුට්"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"කොණ් කට්අවුට්"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sk/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sk/strings.xml
index 5b40d71..f42bbe8 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Rohový výrez obrazovky"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Rohový výrez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sl/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sl/strings.xml
index 52c5aa1..867700c 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Kotni izrez prikaza"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Kotna zareza"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sq/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sq/strings.xml
index cb39653..aa562e3 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sq/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sq/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Prerje e ekranit në qoshe"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Prerje këndore"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sr/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sr/strings.xml
index 4c5701a..0adf1dd 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Изрезана слика у углу екрана"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Изрезана слика у углу екрана"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sv/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sv/strings.xml
index ccc72fd..9e24a43 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sv/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Urklipp av skärmens hörn"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Kantutskärning"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sw/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sw/strings.xml
index 6066426..bf105c4 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-sw/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Mwonekano wenye pengo pembeni"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Mkato kwenye kona"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ta/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ta/strings.xml
index a0a30cf..4c57578 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ta/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ta/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"மூலை கட்அவுட் காட்சி"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"மூலை கட்அவுட்"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-te/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-te/strings.xml
deleted file mode 100644
index 6c10a13..0000000
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-te/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"మూల డిస్‌ప్లే కట్అవుట్‌"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-th/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-th/strings.xml
index 57f49d4..714abb6 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-th/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-th/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"คัตเอาท์ดิสเพลย์แบบมุม"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"คัตเอาท์แบบมุม"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-tl/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-tl/strings.xml
index 3d4552e..a325ca1 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-tl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-tl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Display cutout sa sulok"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Cutout sa sulok"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-tr/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-tr/strings.xml
index a065978..e781320 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-tr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-tr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Köşe ekran kesimi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Köşe kesimi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-uk/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-uk/strings.xml
index 0b6a774..324e154 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-uk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-uk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Відключення кутового дисплея"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Відрізання кутів"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ur/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ur/strings.xml
index 2aeecc6..e7c5152 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ur/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ur/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"کارنر ڈسپلے کٹ آؤٹ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"کارنر کٹ آؤٹ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-uz/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-uz/strings.xml
index 249ff2e..0d19b66 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-uz/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-uz/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Burchak ekran kesimi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Burchak kesimi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-vi/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-vi/strings.xml
index a217bf8..15a66e3 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-vi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-vi/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Cắt hiển thị ở góc"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Vết cắt ở góc"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rCN/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rCN/strings.xml
index 4cb357b..2d437ae 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rCN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rCN/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"边角显示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"边角刘海屏"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rHK/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rHK/strings.xml
index 5fcfbc3..997ebac 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rHK/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rHK/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"邊角顯示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"邊角凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rTW/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rTW/strings.xml
index e6c75b5..997ebac 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rTW/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zh-rTW/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"邊角螢幕凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"邊角凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zu/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zu/strings.xml
index 961d036..4899087 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-zu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4967302169856689448">"Ukusikwa kwekhona lesiboniso"</string>
+    <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Ukusikwa kwekhona"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-af/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-af/strings.xml
index af108e8..2815df2 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-af/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-af/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dubbelskermuitsnede"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dubbeluitsnede"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-am/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-am/strings.xml
index 8b03bde..f41eadc 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-am/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-am/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"የድርብ ማሳያ ቅርጽ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ድርብ ቅርጽ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ar/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ar/strings.xml
index 34065f8..106ce3d 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ar/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ar/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"صورة مقطوعة لشاشة مزدوجة"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"صورة مقطوعة مزدوجة"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-as/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-as/strings.xml
index 0b93c40..7a780d7 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-as/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-as/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"দ্বৈত ডিছপ্লে কাটআউট"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"দ্বৈত কাটআউট"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-az/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-az/strings.xml
index 732ebe5..612a849 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-az/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-az/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"İkiqat ekran kəsimi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"İkiqat kəsim"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-b+sr+Latn/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-b+sr+Latn/strings.xml
index 089f20b..d2eb7db 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-b+sr+Latn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-b+sr+Latn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Izrezana slika za duple ekrane"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Izrezana slika za duple ekrane"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-be/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-be/strings.xml
index 1763bd4..1a398c82 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-be/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-be/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Павялічыць выраз на экране ўдвая"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Двайны выраз"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bg/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bg/strings.xml
index 8952d12..09b59756 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bg/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bg/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Двоен прорез на екрана"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Двоен прорез"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bn/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bn/strings.xml
deleted file mode 100644
index d1eee2f3..0000000
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bn/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ডবল ডিসপ্লে কাট-আউট"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bs/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bs/strings.xml
index 3c40f98..655db33 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-bs/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dvostruki urez ekrana"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dvostruki urez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ca/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ca/strings.xml
index 096a62d..10d5ae7 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ca/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ca/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Retall de pantalla doble"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Retall doble"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-cs/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-cs/strings.xml
index e979511..2f3aab9 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-cs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-cs/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dvojitý výřez displeje"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dvojitý výřez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-da/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-da/strings.xml
index 27dc82e..3f9bae1 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-da/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-da/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dobbelt udskæring på skærmen"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dobbelt hak"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-de/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-de/strings.xml
index c73fa2d..5fc9176 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-de/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-de/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Doppelter Display-Ausschnitt"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Doppelte Aussparung"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-el/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-el/strings.xml
index c744a45..f3cc093 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-el/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-el/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Διακοπή διπλής οθόνης"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Διπλή εγκοπή"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rAU/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rAU/strings.xml
index 648edfe..31f2a5a 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rAU/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rAU/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Double display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Double cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rCA/strings.xml
index 648edfe..31f2a5a 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rCA/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Double display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Double cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rGB/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rGB/strings.xml
index 648edfe..31f2a5a 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rGB/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rGB/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Double display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Double cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rIN/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rIN/strings.xml
index 648edfe..31f2a5a 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rIN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rIN/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Double display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Double cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rXC/strings.xml
index 5d9e709..ea09dde 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rXC/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎Double display cutout‎‏‎‎‏‎"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎Double cutout‎‏‎‎‏‎"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-es-rUS/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-es-rUS/strings.xml
index 44cd9be..d57c2fc 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-es-rUS/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-es-rUS/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Recorte de pantalla doble"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Corte doble"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-es/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-es/strings.xml
index 44cd9be..e5d1bff 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-es/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-es/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Recorte de pantalla doble"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Recorte doble"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-et/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-et/strings.xml
index 9edaf8e..1e75a92 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-et/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-et/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Topeltekraani väljalõige"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Topeltväljalõige"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-eu/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-eu/strings.xml
index 18000bd..bd7f8d5 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-eu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-eu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Pantailaren mozketa bikoitza"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Mozketa bikoitza"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fa/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fa/strings.xml
index d350822..0b38e68 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fa/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"نمایشگر با لبه دوتایی"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"نمایشگر با لبه بریده دوتایی"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fi/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fi/strings.xml
index 33766fd..5d85064 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fi/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Kaksoisaukko näytössä"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Kaksoislovi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fr-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fr-rCA/strings.xml
index 8fa31c4..2ee7917 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fr-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fr-rCA/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Découpe d\'affichage double"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Encoche double"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fr/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fr/strings.xml
index 9f55c9c..2ee7917 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-fr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Encoche pour écran double"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Encoche double"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-gl/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-gl/strings.xml
index 92832da..8d854c8 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-gl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-gl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Recorte de pantalla dobre"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Recorte dobre"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-gu/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-gu/strings.xml
index 43e67a0..b1ca50b 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-gu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-gu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ડબલ ડિસ્પ્લે કટઆઉટ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ડબલ કટઆઉટ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hi/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hi/strings.xml
deleted file mode 100644
index 8412c14..0000000
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hi/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"डबल डिसप्ले कटआउट"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hr/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hr/strings.xml
index 9d7a8ce..655db33 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Obrezana slika za dvostruke zaslone"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dvostruki urez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hu/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hu/strings.xml
index 0af2ad3..acf4f4d4b 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dupla képernyőkivágás"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dupla kivágás"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hy/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hy/strings.xml
index 7907d0a..9994cf9 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hy/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-hy/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Էկրանի կրկնակի կտրվածք"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Կրկնակի կտրվածք"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-in/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-in/strings.xml
index 45f5952..78343e8 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-in/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-in/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Potongan tampilan ganda"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Potongan ganda"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-is/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-is/strings.xml
index 9109489..fe2eefc 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-is/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-is/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Tvöfaldur skjáskurður"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Tvöfaldur skurður"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-it/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-it/strings.xml
index 4aa869e..a1126cc 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-it/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-it/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Ritaglio display doppio"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Ritaglio doppio"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-iw/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-iw/strings.xml
index eff8a8d..2e7aeb0 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-iw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-iw/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"חיתוך תצוגה כפול"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"מגרעת כפולה"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ja/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ja/strings.xml
index 5346e97..dadc8a8 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ja/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ja/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ダブル ディスプレイ カットアウト"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ダブル カットアウト"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ka/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ka/strings.xml
index 515ac25..4ec33c9 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ka/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ka/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ეკრანის ორმაგი ამოჭრა"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ორმაგი ამოჭრა"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-kk/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-kk/strings.xml
index c812d0c..6592e24 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-kk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-kk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Қос дисплейді өшіру"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Ойықты екі есе ұлғайту"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-km/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-km/strings.xml
index 0a52444..8a7fcec 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-km/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-km/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ស្នាមចោះ​ផ្ទាំង​អេក្រង់​ភ្លោះ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ស្នាមចោះ​ភ្លោះ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-kn/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-kn/strings.xml
index 02500db..e88e045 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-kn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-kn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ಡಬಲ್ ಡಿಸ್‌ಪ್ಲೇ ಕಟೌಟ್"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ಡಬಲ್ ಕಟೌಟ್"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ko/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ko/strings.xml
index 5505f57..fa114f0 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ko/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ko/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"더블 디스플레이 컷아웃"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"이중 컷아웃"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ky/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ky/strings.xml
index baf2f4d..3fc7446 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ky/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ky/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Кош дисплей кесиндиси"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Кош кесинди"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lo/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lo/strings.xml
index 5823a82..f65b1ef 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lo/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lo/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ກ່ອງຂໍ້ຄວາມສະແດງຜົນຄູ່"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ຮອຍບາກຄູ່"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lt/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lt/strings.xml
index 7c1ba7d..f47d060 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lt/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dviguba ekrano išpjova"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dviguba išpjova"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lv/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lv/strings.xml
index 5452e9c..a2810a3 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-lv/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Divkāršs ekrāna izgriezums"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Divkāršs izgriezums"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mk/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mk/strings.xml
index d232838..7b83881 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Двоен исечок на екранот"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Двоен исечок"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ml/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ml/strings.xml
index 9aff47d..21b5ec7 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ml/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ml/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ഇരട്ട ഡിസ്‌പ്ലേ കട്ടൗട്ട്"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ഇരട്ട കട്ട്ഔട്ട്"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mn/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mn/strings.xml
index c43f18a..be8e6a5 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Давхар дэлгэцийг таслах"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Давхар болгож таслах"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mr/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mr/strings.xml
index e2065ac..d574f6c 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-mr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"दुहेरी डिस्प्ले कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"डबल कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ms/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ms/strings.xml
index b3085ef..82197a3 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ms/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ms/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Potongan paparan berganda"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Potongan berganda"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-my/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-my/strings.xml
index 0744f12..2249d6e 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-my/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-my/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"မျက်နှာပြင် အထက်အောက် ဖြတ်ညှပ်ပြသမှု"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"နှစ်ဆင့် ဖြတ်ညှပ်ပြသမှု"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-nb/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-nb/strings.xml
index e4b6c76..b44b117 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-nb/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-nb/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dobbelt skjermutklipp"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dobbelt utklipp"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ne/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ne/strings.xml
index 49f82b9..91ebb8c 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ne/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ne/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"दोहोरो प्रदर्शनसम्बन्धी कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"दोहोरो कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-nl/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-nl/strings.xml
index d46f770..078829f 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-nl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-nl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dubbele display-cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dubbele cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-or/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-or/strings.xml
index 1a5d801..471c007 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-or/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-or/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ଡବଲ୍ ଡିସ୍‌ପ୍ଲେ କଟଆଉଟ୍"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ଯୋଡା ଫଳକ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pa/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pa/strings.xml
index da57fde..afd4eab 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pa/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ਡਿਸਪਲੇ ਦੀ ਦੋਹਰੀ ਵੰਡ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ਦੋਹਰਾ ਕੱਟਆਊਟ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pl/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pl/strings.xml
index 9534412..66c20f78 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Podwójne wycięcie w ekranie"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Wycięcie podwójne"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt-rBR/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt-rBR/strings.xml
index 8c05472..fbce009 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt-rBR/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt-rBR/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Corte de tela duplo"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Corte duplo"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt-rPT/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt-rPT/strings.xml
index b9c30c6..585c31f 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt-rPT/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt-rPT/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Ecrã duplo com recorte"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Recorte duplo"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt/strings.xml
index 8c05472..fbce009 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-pt/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Corte de tela duplo"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Corte duplo"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ro/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ro/strings.xml
index a22afe6..04d85f0 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ro/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ro/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Decupare dublă pe ecran"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Decupaj dublu"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ru/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ru/strings.xml
index 14dd606..a02eaf7 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ru/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ru/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Увеличить вырез на экране вдвое"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Увеличить вырез вдвое"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-si/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-si/strings.xml
index c15208f..274924b 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-si/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-si/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ද්විත්ව තිර කට්අවුට්"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"ද්විත්ව කට්අවුට්"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sk/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sk/strings.xml
index 98a74c1..8d65427 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dvojitý výrez obrazovky"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dvojitý výrez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sl/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sl/strings.xml
index 4f12711..66de901 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Izrez dvojnega prikaza"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dvojna zareza"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sq/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sq/strings.xml
index 96a68d5..73222ab 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sq/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sq/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Prerje e dyfishtë e ekranit"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Prerje e dyfishtë"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sr/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sr/strings.xml
index 8930813..99b89a2 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Изрезана слика за дупле екране"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Изрезана слика за дупле екране"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sv/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sv/strings.xml
index 42b7aed..aaa6971 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sv/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dubbelt urklipp av skärm"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dubbel utskärning"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sw/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sw/strings.xml
index a39f77d..486e946 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-sw/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Mwonekano wenye mapengo mawili"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Mikato miwili"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ta/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ta/strings.xml
index b3c19b6..e4f96f9 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ta/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ta/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"இரட்டை கட்அவுட் காட்சி"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"இரட்டை கட்அவுட்"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-te/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-te/strings.xml
deleted file mode 100644
index b8573db..0000000
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-te/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"డబుల్ డిస్‌ప్లే కట్అవుట్‌"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-th/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-th/strings.xml
index 8fdd693..0423e86 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-th/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-th/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"ตัดหน้าจอสองด้าน"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"คัตเอาท์แบบคู่"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-tl/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-tl/strings.xml
index e68b5ec..cd959da 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-tl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-tl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Dobleng display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Dobleng cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-tr/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-tr/strings.xml
index 3ae92f0..df91cc8 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-tr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-tr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Çift ekran kesimi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Çift kesim"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-uk/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-uk/strings.xml
index cf6df69..f551429 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-uk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-uk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Відключення подвійного дисплея"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Подвійне відрізання"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ur/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ur/strings.xml
index 3c9666d..f1e44e3 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ur/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ur/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"دوہرا ڈسپلے کٹ آؤٹ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"دوہرا کٹ آؤٹ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-uz/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-uz/strings.xml
index 9e74192..d585d7e 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-uz/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-uz/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Ekran kesimini ikki marta kattalashtirish"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Kesimni ikki marta kattalashtirish"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-vi/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-vi/strings.xml
index 442805a..96096c2 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-vi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-vi/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Cắt hiển thị kép"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Vết cắt kép"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rCN/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rCN/strings.xml
index 06b1379..43de56f 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rCN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rCN/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"双显示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"双刘海屏"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rHK/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rHK/strings.xml
index 6da1a7f..9d3371c 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rHK/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rHK/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"雙顯示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"雙凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rTW/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rTW/strings.xml
index 72932b5..9d3371c 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rTW/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zh-rTW/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"雙螢幕凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"雙凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zu/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zu/strings.xml
index 2e0a5bd..31e57f0 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-zu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="5659433562878674546">"Ukusikwa kokuboniswa okukabili"</string>
+    <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Ukusika kabiliDouble cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-af/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-af/strings.xml
index 98b4303..09316bc 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-af/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-af/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Uitsnede vir smal vertoonskerm"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Smal uitsnede"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-am/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-am/strings.xml
index 2fc0dbe..25cb2cf 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-am/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-am/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"የጠባብ ማሳያ ቅርጽ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ጠባብ ቅርጽ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ar/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ar/strings.xml
index aae2ada..3294bc8 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ar/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ar/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"صورة مقطوعة لشاشة ضيقة"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"صورة مقطوعة ضيقة"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-as/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-as/strings.xml
index 181bcbf..8e535df 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-as/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-as/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ঠেক ডিছপ্লে কাটআউট"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ঠেক কাটআউট"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-az/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-az/strings.xml
index f5b856b..7939aea 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-az/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-az/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Dar ekran profili"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Dar kəsim"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-b+sr+Latn/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-b+sr+Latn/strings.xml
index 0a9aaaf..d78d344 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-b+sr+Latn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-b+sr+Latn/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Izrezana slika za uske ekrane"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Izrezana slika za uske ekrane"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-be/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-be/strings.xml
index 189f1ccd..d21b0f7 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-be/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-be/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Зрабіць выраз на экране больш вузкім"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Вузкі выраз"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bg/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bg/strings.xml
index d236710..61d90b4 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bg/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bg/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Тесен прорез на екрана"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Тесен прорез"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bn/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bn/strings.xml
deleted file mode 100644
index 301d686..0000000
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bn/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2017, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ন্যারো ডিসপ্লে কাট-আউট"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bs/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bs/strings.xml
index 8ceaac5..8fe6f2d 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-bs/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Uski urez ekrana"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Uski urez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ca/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ca/strings.xml
index ab9061e..106b75c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ca/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ca/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Retall de pantalla estret"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Retall estret"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-cs/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-cs/strings.xml
index 440a2f0..5e56a7b 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-cs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-cs/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Úzký výřez displeje"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Úzký výřez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-da/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-da/strings.xml
index 4372d56..6681a12 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-da/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-da/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Smal udskæring på skærmen"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Smalt hak"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-de/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-de/strings.xml
index a92a24a..3dd023a 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-de/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-de/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Schmaler Display-Ausschnitt"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Schmale Aussparung"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-el/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-el/strings.xml
index 69adde3..21fb5b7 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-el/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-el/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Διακοπή στενής οθόνης"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Στενή εγκοπή"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rAU/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rAU/strings.xml
index bf2624f..2716eae 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rAU/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rAU/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Narrow display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Narrow cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rCA/strings.xml
index bf2624f..2716eae 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rCA/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Narrow display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Narrow cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rGB/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rGB/strings.xml
index bf2624f..2716eae 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rGB/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rGB/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Narrow display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Narrow cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rIN/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rIN/strings.xml
index bf2624f..2716eae 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rIN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rIN/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Narrow display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Narrow cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rXC/strings.xml
index 7ba124fb..df51da4 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rXC/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎Narrow display cutout‎‏‎‎‏‎"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎Narrow cutout‎‏‎‎‏‎"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-es-rUS/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-es-rUS/strings.xml
index f1d3348..2723d1b 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-es-rUS/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-es-rUS/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Recorte de pantalla estrecho"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Corte estrecho"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-es/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-es/strings.xml
index a17a32c..89ec75f 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-es/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-es/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Recorte estrecho de la pantalla"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Recorte estrecho"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-et/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-et/strings.xml
index 367b221..272280f 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-et/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-et/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Kitsas ekraani väljalõige"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Kitsas väljalõige"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-eu/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-eu/strings.xml
index 0fd9d9b..accdac7 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-eu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-eu/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Pantailaren mozketa estua"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Mozketa estua"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fa/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fa/strings.xml
index 43bfb2e..f3a1185 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fa/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"نمایشگری با لبه باریک"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"لبه باریک"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fi/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fi/strings.xml
index 540fbae..292d5de 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fi/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Kapea aukko näytössä"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Kapea lovi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fr-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fr-rCA/strings.xml
index d78f8b8..577a948 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fr-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fr-rCA/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Découpe d\'affichage étroit"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Encoche étroite"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fr/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fr/strings.xml
index 4ee1b4f..551aa19 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-fr/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Encoche pour écran étroit"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Encoche pour écran étroit"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-gl/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-gl/strings.xml
index 9d01afd..0d1247c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-gl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-gl/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Recorte de pantalla estreito"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Recorte estreito"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-gu/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-gu/strings.xml
index 7d9987e..869842c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-gu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-gu/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"સાંકડું ડિસ્પ્લે કટઆઉટ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"સાંકડું કટઆઉટ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hi/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hi/strings.xml
deleted file mode 100644
index 32d6139..0000000
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hi/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2017, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"कम जगह वाला डिसप्ले कटआउट"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hr/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hr/strings.xml
index 00eca5b..8fe6f2d 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hr/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Obrezana slika za uske zaslone"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Uski urez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hu/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hu/strings.xml
index bfd2944..18b0722 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hu/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Keskeny képernyőkivágás"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Keskeny kivágás"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hy/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hy/strings.xml
index 2afecc8..a07a1bd 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hy/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-hy/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Էկրանի նեղ կտրվածք"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Նեղ կտրվածք"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-in/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-in/strings.xml
index 7728ab6..717449c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-in/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-in/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Potongan tampilan sempit"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Potongan sempit"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-is/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-is/strings.xml
index 3d86080..a353cef 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-is/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-is/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Mjór skjáskurður"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Mjór skurður"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-it/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-it/strings.xml
index 419c12b..ab96ff6 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-it/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-it/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Ritaglio display stretto"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Ritaglio stretto"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-iw/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-iw/strings.xml
index ffde493..a805dcc 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-iw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-iw/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"חיתוך תצוגה צר"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"מגרעת צרה"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ja/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ja/strings.xml
index 2b6a897..fe83639 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ja/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ja/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"幅狭のディスプレイ カットアウト"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"幅狭のカットアウト"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ka/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ka/strings.xml
index e52a32f..6e23255 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ka/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ka/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ეკრანის ვიწრო ამოჭრა"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ვიწრო ამოჭრა"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-kk/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-kk/strings.xml
index ee0d72d..b5da77d 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-kk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-kk/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Жіңішке экран ойығы"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Тар ойық"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-km/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-km/strings.xml
index c1faaa3c..959c9986 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-km/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-km/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ស្នាមចោះ​ផ្ទាំងអេក្រង់​តូច"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ស្នាមចោះ​តូច"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-kn/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-kn/strings.xml
index b356b31..87b390c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-kn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-kn/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ಕಿರಿದಾದ ಪ್ರದರ್ಶನ ಕಟೌಟ್"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ಕಿರಿದಾದ ಕಟೌಟ್"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ko/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ko/strings.xml
index 7175d52..20091a5 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ko/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ko/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"좁은 디스플레이 컷아웃"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"좁은 컷아웃"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ky/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ky/strings.xml
index 97308ca..6d49807 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ky/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ky/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Ичке дисплей кесиндиси"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Ичке кесинди"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lo/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lo/strings.xml
index 6a0251b..7e6ee12 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lo/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lo/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ກ່ອງຂໍ້ຄວາມສະແດງຜົນແບບແຄບ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ຮອຍບາກແຄບ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lt/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lt/strings.xml
index cb8a54b..d62db1e 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lt/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Siaura ekrano išpjova"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Siaura išpjova"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lv/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lv/strings.xml
index c87bc3f..b352a22 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-lv/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Šaurs ekrāna izgriezums"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Šaurs izgriezums"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mk/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mk/strings.xml
index dd93e83..a75c297 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mk/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Тесен исечок на екранот"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Тесен исечок"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ml/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ml/strings.xml
index 3e12f05..cd7e3b9 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ml/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ml/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ഇടുങ്ങിയ ഡി‌സ്‌പ്ലേ കട്ടൗട്ട്"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ഇടുങ്ങിയ കട്ട്ഔട്ട്"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mn/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mn/strings.xml
index 087ed4a..aa2fb6c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mn/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Дэлгэцийг нарийн болгож таслах"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Нарийн болгож таслах"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mr/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mr/strings.xml
index 14a35da..a86cbeb 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-mr/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"अरुंद डिस्प्ले कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"नॅरो कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ms/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ms/strings.xml
index 20edbd7..717449c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ms/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ms/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Potongan paparan sempit"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Potongan sempit"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-my/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-my/strings.xml
index 4f84f2c..287b535 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-my/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-my/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ကျဉ်းမြောင်းသည့် မျက်နှာပြင် ဖြတ်ညှပ်ပြသမှု"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ကျဉ်းမြောင်းစွာ ဖြတ်ညှပ်ပြသမှု"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-nb/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-nb/strings.xml
index 300e988..dbb4c27 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-nb/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-nb/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Smalt skjermutklipp"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Smalt utklipp"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ne/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ne/strings.xml
index 9027414..0a68f0d 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ne/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ne/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"साँघुरो प्रदर्शनसम्बन्धी कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"साँघुरो कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-nl/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-nl/strings.xml
index b6f7f02..5783f5c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-nl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-nl/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Smalle display-cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Smalle cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-or/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-or/strings.xml
index 031edf0..a033d58 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-or/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-or/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ସଙ୍କୀର୍ଣ୍ଣ ଡିସ୍‌ପ୍ଲେ କଟଆଉଟ୍"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ସଂକୀର୍ଣ୍ଣ ଫଳକ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pa/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pa/strings.xml
index ddc0b11..83d3c02 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pa/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"ਤੰਗ ਡਿਸਪਲੇ ਕੱਟਆਊਟ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"ਤੰਗ ਕੱਟਆਊਟ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pl/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pl/strings.xml
index 1e0b3ff..624e224 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pl/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Wąskie wycięcie w ekranie"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Wycięcie wąskie"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt-rBR/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt-rBR/strings.xml
index 3af25e8..60aa0e7 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt-rBR/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt-rBR/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Corte da tela estreito"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Corte estreito"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt-rPT/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt-rPT/strings.xml
index 257c974..0d1247c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt-rPT/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt-rPT/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Ecrã estreito com recorte"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Recorte estreito"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt/strings.xml
index 3af25e8..60aa0e7 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-pt/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Corte da tela estreito"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Corte estreito"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ro/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ro/strings.xml
index 26d5448..ca67203 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ro/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ro/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Decupare ecran îngustă"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Decupaj îngust"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ru/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ru/strings.xml
index 0b8693c..207268c 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ru/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ru/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Сделать вырез на экране уже"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Сузить вырез"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-si/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-si/strings.xml
index 0f4a8ff..7cca5b9 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-si/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-si/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"පටු සංදර්ශක කටවුට්"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"පටු කට්අවුට්"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sk/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sk/strings.xml
index 4cda8d5..72a714e 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sk/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Úzky výrez obrazovky"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Úzky výrez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sl/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sl/strings.xml
index 290df41..a2f3a43 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sl/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Ozek izrez prikaza"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Ozka zareza"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sq/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sq/strings.xml
index be0a1e4..14ad99d 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sq/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sq/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Prerje e ngushtë ekrani"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Prerje e ngushtë"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sr/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sr/strings.xml
index d0710ac..9026c36 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sr/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Изрезана слика за уске екране"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Изрезана слика за уске екране"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sv/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sv/strings.xml
index f8c4bc3..3dc8753 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sv/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Smalt urklipp av skärm"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Smal utskärning"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sw/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sw/strings.xml
index 1aa3014..6032125 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-sw/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Mwonekeno wenye pengo jembamba"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Mkato mwembamba"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ta/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ta/strings.xml
index 8481f29..79c3186 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ta/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ta/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"குறுகிய கட்அவுட் காட்சி"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"குறுகிய கட்அவுட்"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-te/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-te/strings.xml
deleted file mode 100644
index 4e71bac..0000000
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-te/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2017, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"సన్నని డిస్‌ప్లే కట్అవుట్‌"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-th/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-th/strings.xml
index 4989e86..6506ef9 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-th/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-th/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"คัตเอาท์ดิสเพลย์แบบแคบ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"คัตเอาท์แบบแคบ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-tl/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-tl/strings.xml
index 3c88b3f..fe34b9a 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-tl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-tl/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Manipis na display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Manipis na cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-tr/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-tr/strings.xml
index d84b758..022f1e3 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-tr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-tr/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Dar ekran kesimi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Dar kesim"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-uk/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-uk/strings.xml
index b5109de..15ebc5d 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-uk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-uk/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Відключення вузького дисплея"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Вузьке відрізання"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ur/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ur/strings.xml
index 5dba372..9dda24e 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ur/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-ur/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"تنگ ڈسپلے کٹ آؤٹ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"تنگ کٹ آؤٹ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-uz/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-uz/strings.xml
index 64bf629..d9f0ca0 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-uz/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-uz/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Ekrandagi kesimni qisqartirish"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Kesimni qisqartirish"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-vi/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-vi/strings.xml
index 0cf0602..c205a7d 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-vi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-vi/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Cắt hiển thị hẹp"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Vết cắt hẹp"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rCN/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rCN/strings.xml
index 211ea2f..3102576 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rCN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rCN/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"窄型显示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"窄型刘海屏"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rHK/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rHK/strings.xml
index c187813..505693f 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rHK/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rHK/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"幼身顯示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"幼身凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rTW/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rTW/strings.xml
index 5799fed..ae50b4a 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rTW/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zh-rTW/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"窄型螢幕凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"窄型凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zu/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zu/strings.xml
index 785ec6f..7a77583 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-zu/strings.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="6129374114103110395">"Ukusikwa kwesiboniso esimcingo"</string>
+    <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Ukusika okucijile"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-af/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-af/strings.xml
index e561329..6018ef4 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-af/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-af/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Uitsnede vir lang vertoonskerm"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Lang uitsnede"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-am/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-am/strings.xml
index 16a82a1..2b299cf 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-am/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-am/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"የረጅም ማሳያ ቅርጽ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ረዥም ቅርጽ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ar/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ar/strings.xml
index 06cab99..4bec886 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ar/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ar/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"صورة مقطوعة لشاشة طويلة"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"صورة مقطوعة طويلة"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-as/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-as/strings.xml
index 6adad3d..e8274b4 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-as/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-as/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ওখ ডিছপ্লে কাটআউট"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ওখ কাটআউট"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-az/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-az/strings.xml
index a14afc4..84af1e2 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-az/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-az/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Uzun ekran profili"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Hündür kəsim"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-b+sr+Latn/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-b+sr+Latn/strings.xml
index 2212e82..46d30c6 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-b+sr+Latn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-b+sr+Latn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Izrezana slika za visoke ekrane"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Izrezana slika za visoke ekrane"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-be/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-be/strings.xml
index 53bb487..45dc1db 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-be/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-be/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Зрабіць выраз на экране больш высокім"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Высокі выраз"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bg/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bg/strings.xml
index a33cc39..b657d58 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bg/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bg/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Голям прорез на екрана"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Голям прорез"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bn/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bn/strings.xml
deleted file mode 100644
index 8513761..0000000
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bn/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"টল ডিসপ্লে কাট-আউট"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bs/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bs/strings.xml
index 4f0ed61..c7b35b6 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-bs/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Dugačak urez ekrana"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Dugačak urez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ca/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ca/strings.xml
index d264e34..4d5c5d3 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ca/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ca/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Retall de pantalla alt"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Retall alt"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-cs/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-cs/strings.xml
index fa5ceee..07ad2bc 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-cs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-cs/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Vysoký výřez displeje"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Vysoký výřez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-da/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-da/strings.xml
index 75e2d5d..b4f65d1 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-da/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-da/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Stor udskæring på skærmen"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Højt hak"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-de/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-de/strings.xml
index 6c65b16..f14479c 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-de/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-de/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Hoher Display-Ausschnitt"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Hohe Aussparung"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-el/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-el/strings.xml
index 1167237..a4815d4 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-el/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-el/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Διακοπή ψηλής οθόνης"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Ψηλή εγκοπή"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rAU/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rAU/strings.xml
index 3a41cbe..fce927c 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rAU/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rAU/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Tall display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Tall cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rCA/strings.xml
index 3a41cbe..fce927c 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rCA/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Tall display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Tall cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rGB/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rGB/strings.xml
index 3a41cbe..fce927c 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rGB/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rGB/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Tall display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Tall cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rIN/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rIN/strings.xml
index 3a41cbe..fce927c 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rIN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rIN/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Tall display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Tall cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rXC/strings.xml
index db56bac..01a2d7c 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rXC/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎Tall display cutout‎‏‎‎‏‎"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎Tall cutout‎‏‎‎‏‎"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-es-rUS/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-es-rUS/strings.xml
index 3223601..5ecec17 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-es-rUS/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-es-rUS/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Recorte de pantalla alto"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Corte alto"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-es/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-es/strings.xml
index 1a73f18..ad06990 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-es/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-es/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Recorte alto de la pantalla"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Recorte alto"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-et/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-et/strings.xml
index ec84069..cdb23cc 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-et/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-et/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Pikk ekraani väljalõige"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Pikk väljalõige"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-eu/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-eu/strings.xml
index 7445925..e141906 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-eu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-eu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Pantailaren mozketa altua"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Mozketa altua"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fa/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fa/strings.xml
index 57990e8..0aece54 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fa/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"نمایشگر با لبه بلند"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"لبه بلند"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fi/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fi/strings.xml
index 4add280..fe4f59b 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fi/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Korkea aukko näytössä"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Korkea lovi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fr-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fr-rCA/strings.xml
index cf15b14..da3705e 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fr-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fr-rCA/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Découpe d\'affichage haut"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Encoche grande"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fr/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fr/strings.xml
index f5db328..58c42b4 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-fr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Encoche pour écran haut"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Encoche pour écran haut"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-gl/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-gl/strings.xml
index 3223601..ad06990 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-gl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-gl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Recorte de pantalla alto"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Recorte alto"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-gu/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-gu/strings.xml
index a9a1f4a..1081d69 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-gu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-gu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ઊંચું ડિસ્પ્લે કટઆઉટ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ઊંચું કટઆઉટ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hi/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hi/strings.xml
deleted file mode 100644
index dbd3e84..0000000
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hi/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"लंबा डिसप्ले कटआउट"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hr/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hr/strings.xml
index 34082f8..5da0b46 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Obrezana slika za visoke zaslone"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Visoki urez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hu/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hu/strings.xml
index 7b871c5..2b00083 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Magas képernyőkivágás"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Magas kivágás"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hy/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hy/strings.xml
index ebff54c..be94922 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hy/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-hy/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Էկրանի բարձր կտրվածք"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Բարձր կտրվածք"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-in/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-in/strings.xml
index 9740135..e74f283 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-in/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-in/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Potongan tampilan tinggi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Potongan tinggi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-is/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-is/strings.xml
index f039cb9..dbeaade 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-is/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-is/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Hár skjáskurður"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Hár skurður"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-it/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-it/strings.xml
index af09afd..cd34197 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-it/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-it/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Ritaglio display alto"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Ritaglio alto"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-iw/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-iw/strings.xml
index faf3630..4034ccd 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-iw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-iw/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"חיתוך תצוגה גבוה"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"מגרעת גבוהה"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ja/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ja/strings.xml
index 86974bc..185c69f 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ja/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ja/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"縦長のディスプレイ カットアウト"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"縦長のカットアウト"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ka/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ka/strings.xml
index f84faba..f117b94 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ka/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ka/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ეკრანის მაღალი ამოჭრა"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"მაღალი ამოჭრა"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-kk/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-kk/strings.xml
index 8747ff0..cf89e6c 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-kk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-kk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Ұзын экран ойығы"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Тігінен ойық жасау"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-km/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-km/strings.xml
index 1741d58..eba93ef 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-km/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-km/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ស្នាមចោះ​ផ្ទាំងអេក្រង់​ជ្រៅ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ស្នាមចោះ​ជ្រៅ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-kn/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-kn/strings.xml
index ce1beb4..17298df 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-kn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-kn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ಎತ್ತರದ ಪ್ರದರ್ಶನ ಕಟೌಟ್"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ಎತ್ತರದ ಕಟೌಟ್"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ko/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ko/strings.xml
index c91015c..f81a533 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ko/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ko/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"세로로 긴 디스플레이 컷아웃"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"세로로 긴 컷아웃"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ky/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ky/strings.xml
index 0fbf920..c5aa62c 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ky/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ky/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Узун дисплей кесиндиси"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Узун кесинди"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lo/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lo/strings.xml
index f5ed0a8..83ba313 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lo/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lo/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ກ່ອງຂໍ້ຄວາມສະແດງຜົນແບບສູງ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ຮອຍບາກສູງ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lt/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lt/strings.xml
index 9afa5bd..5c0eb8f 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lt/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Ilga ekrano išpjova"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Ilga išpjova"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lv/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lv/strings.xml
index ec80989..4087f99 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-lv/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Augsts ekrāna izgriezums"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Augsts izgriezums"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mk/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mk/strings.xml
index b58b8ff..fcfe2d6 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Висок исечок на екранот"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Висок исечок"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ml/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ml/strings.xml
index 561ac16..c582ddf 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ml/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ml/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ഉയരമുളള ഡി‌സ്‌പ്ലേ കട്ടൗട്ട്"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ഉയരമുളള കട്ട്ഔട്ട്"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mn/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mn/strings.xml
index f45a11c..d42a3da 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Дэлгэцийг өндөр болгож таслах"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Урт болгож таслах"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mr/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mr/strings.xml
index 6f19f27..a8bdf05 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-mr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"उंच डिस्प्ले कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"टॉल कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ms/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ms/strings.xml
index 1847595..e74f283 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ms/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ms/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Potongan paparan tinggi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Potongan tinggi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-my/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-my/strings.xml
index 353d766..71b7397 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-my/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-my/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ရှည်လျားသည့် မျက်နှာပြင် ဖြတ်ညှပ်ပြသမှု"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ရှည်လျားစွာ ဖြတ်ညှပ်ပြသမှု"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-nb/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-nb/strings.xml
index ab1c4c6..ac5dcef 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-nb/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-nb/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Høyt skjermutklipp"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Høyt utklipp"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ne/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ne/strings.xml
index c969172..c83f6b4 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ne/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ne/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"अग्लो प्रदर्शनसम्बन्धी कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"अग्लो कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-nl/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-nl/strings.xml
index d7db4a9..06aa9e8 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-nl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-nl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Grote display-cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Hoge cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-or/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-or/strings.xml
index 2aba08b..198a728 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-or/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-or/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ଉଚ୍ଚ ଡିସ୍‌ପ୍ଲେ କଟଆଉଟ୍"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ଉଚ୍ଚା ଫଳକ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pa/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pa/strings.xml
index b10a5d0..02abc7f 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pa/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"ਲੰਮਾ ਡਿਸਪਲੇ ਕੱਟਆਊਟ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"ਲੰਮਾ ਕੱਟਆਊਟ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pl/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pl/strings.xml
index 4bd3c48..d98fe68 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Wysokie wycięcie w ekranie"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Wycięcie wysokie"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt-rBR/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt-rBR/strings.xml
index 893dd76..5ecec17 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt-rBR/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt-rBR/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Corte da tela alto"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Corte alto"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt-rPT/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt-rPT/strings.xml
index 817dfec..d801d27 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt-rPT/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt-rPT/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Ecrã grande com recorte"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Recorte grande"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt/strings.xml
index 893dd76..5ecec17 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-pt/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Corte da tela alto"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Corte alto"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ro/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ro/strings.xml
index 32d771c..3f6264e 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ro/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ro/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Decupare ecran înaltă"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Decupaj înalt"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ru/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ru/strings.xml
index ef1a690..1d1656d 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ru/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ru/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Сделать вырез на экране выше"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Сделать вырез выше"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-si/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-si/strings.xml
index 6d34b5bd..756ddc3 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-si/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-si/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"උස සංදර්ශක කටවුට්"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"උස කට්අවුට්"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sk/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sk/strings.xml
index 553e08d..6e427f6 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Vysoký výrez obrazovky"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Vysoký výrez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sl/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sl/strings.xml
index 9ad38ca..2e0246a 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Visok izrez prikaza"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Visoka zareza"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sq/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sq/strings.xml
index ab6fd63..4586e99 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sq/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sq/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Prerje e lartë ekrani"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Prerje e gjatë"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sr/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sr/strings.xml
index 4f457f6..8ee39b8 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Изрезана слика за високе екране"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Изрезана слика за високе екране"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sv/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sv/strings.xml
index d0be3c3..f64addd 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sv/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Avlångt urklipp av skärm"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Avlång utskärning"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sw/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sw/strings.xml
index 463a703..ff53ff0 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-sw/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Mwonekeno wenye pengo ndefu"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Mkato mrefu"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ta/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ta/strings.xml
index d7ccc78..2ac88fd 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ta/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ta/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"உயரமான கட்அவுட் காட்சி"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"உயரமான கட்அவுட்"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-te/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-te/strings.xml
deleted file mode 100644
index 7de7e93..0000000
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-te/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"పొడవైన డిస్‌ప్లే కట్అవుట్‌"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-th/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-th/strings.xml
index ad6256e..edbd672 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-th/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-th/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"คัตเอาท์ดิสเพลย์แบบสูง"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"คัตเอาท์แบบสูง"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-tl/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-tl/strings.xml
index e9568be..8cf7058 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-tl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-tl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Mataas na display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Mataas na cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-tr/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-tr/strings.xml
index 1e75a40..54216d3 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-tr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-tr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Uzun ekran kesimi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Uzun kesim"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-uk/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-uk/strings.xml
index 94a9369..46747b2 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-uk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-uk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Відключення високого дисплея"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Відрізання по висоті"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ur/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ur/strings.xml
index f45451c..e7186c7 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ur/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ur/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"لمبا ڈسپلے کٹ آؤٹ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"لمبا کٹ آؤٹ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-uz/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-uz/strings.xml
index 6d09785..5efafd5 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-uz/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-uz/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Ekrandagi kesimni balandroq qilish"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Kesimni balandroq qilish"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-vi/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-vi/strings.xml
index 650a30b..d84734f 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-vi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-vi/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Cắt hiển thị cao"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Vết cắt cao"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rCN/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rCN/strings.xml
index 4e4ff89..4ca659f 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rCN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rCN/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"长型显示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"长型刘海屏"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rHK/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rHK/strings.xml
index 3aa87e0..dfabd42 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rHK/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rHK/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"長身顯示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"長身凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rTW/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rTW/strings.xml
index cde32db..41b3770 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rTW/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zh-rTW/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"長型螢幕凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"長型凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zu/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zu/strings.xml
index ff1b633..d1f424a 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-zu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="4955013674374634273">"Ukusikwa kwesiboniso esinde"</string>
+    <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Ukusika okude"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-af/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-af/strings.xml
index eda1e76..cb133ac 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-af/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-af/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Uitsnede vir wye vertoonskerm"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Wye uitsnede"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-am/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-am/strings.xml
index c1345dc..63291b9 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-am/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-am/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"የሰፊ ማሳያ ቅርጽ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"ሰፊ ቅርጽ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ar/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ar/strings.xml
index 0a7bfac..144f174 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ar/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ar/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"صورة مقطوعة لشاشة عريضة"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"صورة مقطوعة عريضة"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-as/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-as/strings.xml
index 49373e4..d72d5f7 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-as/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-as/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"বহল ডিছপ্লে কাটআউট"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"বহল কাটআউট"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-az/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-az/strings.xml
index 3a78dfe6..5ea06b2 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-az/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-az/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Geniş ekran profili"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Geniş kəsim"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-b+sr+Latn/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-b+sr+Latn/strings.xml
index b67afb9..d4160f4 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-b+sr+Latn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-b+sr+Latn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Izrezana slika za široke ekrane"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Izrezana slika za široke ekrane"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-be/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-be/strings.xml
index a3a76f5..7b05ae0 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-be/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-be/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Зрабіць выраз на экране больш шырокім"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Шырокі выраз"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bg/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bg/strings.xml
index d0cf01d..7f52701 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bg/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bg/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Широк прорез на екрана"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Широк прорез"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bn/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bn/strings.xml
deleted file mode 100644
index 9ef4739..0000000
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bn/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"ওয়াইড ডিসপ্লে কাট-আউট"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bs/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bs/strings.xml
index 0aaf27f..233d9a9 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-bs/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Široki urez ekrana"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Široki urez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ca/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ca/strings.xml
index c9aa251..ce85aba 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ca/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ca/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Retall de pantalla ample"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Retall ample"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-cs/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-cs/strings.xml
index dcbb256..da6f83a 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-cs/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-cs/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Široký výřez displeje"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Široký výřez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-da/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-da/strings.xml
index b73b6ae..c5f06c1 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-da/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-da/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Bred udskæring på skærmen"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Bredt hak"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-de/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-de/strings.xml
index 20537dc..8056297 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-de/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-de/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Breiter Display-Ausschnitt"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Breite Aussparung"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-el/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-el/strings.xml
index 04c5e387..ce140ec 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-el/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-el/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Διακοπή πλατιάς οθόνης"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Πλατιά εγκοπή"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rAU/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rAU/strings.xml
index cc0e6c7..8eb5da0 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rAU/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rAU/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Wide display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Wide cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rCA/strings.xml
index cc0e6c7..8eb5da0 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rCA/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Wide display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Wide cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rGB/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rGB/strings.xml
index cc0e6c7..8eb5da0 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rGB/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rGB/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Wide display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Wide cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rIN/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rIN/strings.xml
index cc0e6c7..8eb5da0 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rIN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rIN/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Wide display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Wide cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rXC/strings.xml
index 9310af8..83689c4 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rXC/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎Wide display cutout‎‏‎‎‏‎"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎Wide cutout‎‏‎‎‏‎"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-es-rUS/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-es-rUS/strings.xml
index c88e12d..d840fce 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-es-rUS/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-es-rUS/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Recorte de pantalla ancho"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Corte ancho"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-es/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-es/strings.xml
index f63e427..155fa53 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-es/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-es/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Recorte ancho de la pantalla"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Recorte ancho"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-et/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-et/strings.xml
index f3643a9..ad54c9f 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-et/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-et/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Lai ekraani väljalõige"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Lai väljalõige"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-eu/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-eu/strings.xml
index f13d7f6..2193551 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-eu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-eu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Pantailaren mozketa zabala"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Mozketa zabala"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fa/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fa/strings.xml
index 13cbe2f..d4c57b1 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fa/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"نمایشگر با لبه پهن"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"لبه پهن"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fi/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fi/strings.xml
index 2568605..1ec4264 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fi/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Leveä aukko näytössä"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Leveä lovi"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fr-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fr-rCA/strings.xml
index 92faa6c..f9b15cf 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fr-rCA/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fr-rCA/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Découpe d\'affichage large"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Encoche large"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fr/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fr/strings.xml
index 3e104be..ce8e131 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-fr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Encoche pour écran large"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Encoche pour écran large"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-gl/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-gl/strings.xml
index deafd40..bfef77d 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-gl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-gl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Recorte de pantalla amplo"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Recorte amplo"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-gu/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-gu/strings.xml
index fc08278..0c9f6a7 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-gu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-gu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"પહોળું ડિસ્પ્લે કટઆઉટ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"પહોળું કટઆઉટ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hi/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hi/strings.xml
deleted file mode 100644
index cdea4bb..0000000
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hi/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"चौड़ा डिसप्ले कटआउट"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hr/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hr/strings.xml
index fbb0858..233d9a9 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Obrezana slika za široke zaslone"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Široki urez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hu/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hu/strings.xml
index b9a4729..997f279 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Széles képernyőkivágás"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Széles kivágás"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hy/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hy/strings.xml
index cfe4dbf..e93676c 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hy/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-hy/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Էկրանի լայն կտրվածք"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Լայն կտրվածք"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-in/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-in/strings.xml
index 91440fc..11c5a5f 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-in/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-in/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Potongan tampilan lebar"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Potongan lebar"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-is/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-is/strings.xml
index 367219b..b248256 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-is/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-is/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Breiður skjáskurður"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Breiður skurður"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-it/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-it/strings.xml
index 5349c40..e0c2c12 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-it/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-it/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Ritaglio display largo"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Ritaglio largo"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-iw/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-iw/strings.xml
index 1a2fdd7..ae100e6 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-iw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-iw/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"חיתוך תצוגה רחב"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"מגרעת רחבה"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ja/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ja/strings.xml
index f0fc0a2..126cf58 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ja/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ja/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"幅広のディスプレイ カットアウト"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"幅広のカットアウト"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ka/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ka/strings.xml
index 8a6b89f..87e6129 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ka/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ka/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"ეკრანის ფართო ამოჭრა"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"ფართო ამოჭრა"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-kk/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-kk/strings.xml
index f3124de..e50f34c 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-kk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-kk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Жалпақ экран ойығы"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Көлденеңінен ойық жасау"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-km/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-km/strings.xml
index 6fc8643..a2493a0 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-km/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-km/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"ស្នាមចោះ​ផ្ទាំងអេក្រង់​ធំ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"ស្នាមចោះ​ធំ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-kn/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-kn/strings.xml
index f95180d..65730c5 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-kn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-kn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"ವಿಶಾಲ ಪ್ರದರ್ಶನ ಕಟೌಟ್"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"ವಿಶಾಲವಾದ ಕಟೌಟ್"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ko/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ko/strings.xml
index ea4f638..19350ac 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ko/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ko/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"넓은 디스플레이 컷아웃"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"넓은 컷아웃"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ky/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ky/strings.xml
index 735034d..dafd16e 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ky/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ky/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Жазы дисплей кесиндиси"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Жазы кесинди"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lo/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lo/strings.xml
index 8282319..942f9be 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lo/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lo/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"ກ່ອງຂໍ້ຄວາມສະແດງຜົນແບບກວ້າງ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"ຮອຍບາກກວ້າງ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lt/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lt/strings.xml
index a46ae3d..46251b7 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lt/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Plati ekrano išpjova"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Plati išpjova"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lv/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lv/strings.xml
index 9789d8c..50e3947 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-lv/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Plats ekrāna izgriezums"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Plats izgriezums"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mk/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mk/strings.xml
index 025c46e..dbcae0e 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Широк исечок на екранот"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Широк исечок"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ml/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ml/strings.xml
index 9a47565..ba30add 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ml/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ml/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"വിസ്‌തൃതമായ ഡി‌സ്‌പ്ലേ കട്ടൗട്ട്"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"വിസ്‌തൃതമായ കട്ട്ഔട്ട്"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mn/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mn/strings.xml
index a7d8b5a..a6eb666 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mn/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mn/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Дэлгэцийг өргөн болгож таслах"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Өргөн болгож таслах"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mr/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mr/strings.xml
index 50542af..8f97495 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-mr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"रुंद डिस्प्ले कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"वाइड कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ms/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ms/strings.xml
index ad702b7..11c5a5f 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ms/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ms/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Potongan paparan lebar"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Potongan lebar"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-my/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-my/strings.xml
index 94566da..79b9ce3 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-my/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-my/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"မြင်ကွင်းကျယ် မျက်နှာပြင် ဖြတ်ညှပ်ပြသမှု"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"မြင်ကွင်းကျယ် ဖြတ်ညှပ်ပြသမှု"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-nb/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-nb/strings.xml
index c84fc8b..a7d8e63 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-nb/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-nb/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Bredt skjermutklipp"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Bredt utklipp"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ne/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ne/strings.xml
index 718ca43..7a94507 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ne/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ne/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"फराकिलो प्रदर्शनसम्बन्धी कटआउट"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"फराकिलो कटआउट"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-nl/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-nl/strings.xml
index b57cac7..50800e7 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-nl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-nl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Brede display-cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Brede cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-or/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-or/strings.xml
index b146134..9e61674 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-or/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-or/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"ଓସାରିଆ ଡିସ୍‌ପ୍ଲେ କଟଆଉଟ୍"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"ଓସାରିଆ ଫଳକ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pa/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pa/strings.xml
index c86889f..b425aba 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pa/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pa/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"ਚੌੜਾ ਡਿਸਪਲੇ ਕੱਟਆਊਟ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"ਚੌੜਾ ਕੱਟਆਊਟ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pl/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pl/strings.xml
index f406c72..9c6deeb 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Szerokie wycięcie w ekranie"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Wycięcie szerokie"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt-rBR/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt-rBR/strings.xml
index 16491f8..c6dccb6 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt-rBR/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt-rBR/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Corte da tela largo"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Corte largo"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt-rPT/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt-rPT/strings.xml
index 03d3631..1a36347 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt-rPT/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt-rPT/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Ecrã largo com recorte"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Recorte largo"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt/strings.xml
index 16491f8..c6dccb6 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-pt/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Corte da tela largo"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Corte largo"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ro/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ro/strings.xml
index a1140a8..ebfeafd 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ro/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ro/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Decupare ecran lată"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Decupaj lat"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ru/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ru/strings.xml
index f7d5ec6..1a3e8ef 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ru/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ru/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Сделать вырез на экране шире"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Расширить вырез"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-si/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-si/strings.xml
index 1be117b..6adca77 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-si/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-si/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"පුළුල් සංදර්ශක කටවුට්"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"පුළුල් කට්අවුට්"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sk/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sk/strings.xml
index 059e584..e50b31f 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Široký výrez obrazovky"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Široký výrez"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sl/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sl/strings.xml
index 5c5b5a25..b93b5ff 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Širok izrez prikaza"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Široka zareza"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sq/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sq/strings.xml
index 76271ac..f9c295c 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sq/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sq/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Prerje e gjerë ekrani"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Prerje e gjerë"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sr/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sr/strings.xml
index 6670512..6087dd7 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Изрезана слика за широке екране"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Изрезана слика за широке екране"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sv/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sv/strings.xml
index c624c05..47a06e1 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sv/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sv/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Brett urklipp av skärm"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Bred utskärning"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sw/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sw/strings.xml
index 0414e8a..206f6f7 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sw/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-sw/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Mwonekeno wenye pengo pana"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Mkato mpana"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ta/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ta/strings.xml
index 122a8b2..e62e14b 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ta/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ta/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"அகலமான கட்அவுட் காட்சி"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"அகலமான கட்அவுட்"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-te/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-te/strings.xml
deleted file mode 100644
index 1a0a3bf..0000000
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-te/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"వెడల్పైన డిస్‌ప్లే కట్అవుట్‌"</string>
-</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-th/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-th/strings.xml
index f91a7b6..40841d8 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-th/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-th/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"คัตเอาท์ดิสเพลย์แบบกว้าง"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"คัตเอาท์แบบกว้าง"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-tl/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-tl/strings.xml
index 2f82c4b..7501a22 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-tl/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-tl/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Malapad na display cutout"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Malapad na cutout"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-tr/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-tr/strings.xml
index 01d77d58..a3b1f39 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-tr/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-tr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Geniş ekran kesimi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Geniş kesim"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-uk/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-uk/strings.xml
index 40b5c9d..5c07ce2 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-uk/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-uk/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Відключення широкого дисплея"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Відрізання по ширині"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ur/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ur/strings.xml
index 3bed22a..ad9fe8b 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ur/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-ur/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"چوڑا ڈسپلے کٹ آؤٹ"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"چوڑا کٹ آؤٹ"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-uz/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-uz/strings.xml
index c67c8ca..5aa5fa5 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-uz/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-uz/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Ekrandagi kesimni uzaytirish"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Kesimni uzaytirish"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-vi/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-vi/strings.xml
index c811af0..3ffb81c 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-vi/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-vi/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Cắt hiển thị rộng"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Vết cắt rộng"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rCN/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rCN/strings.xml
index 8aea673..24efd55 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rCN/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rCN/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"宽型显示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"宽型刘海屏"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rHK/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rHK/strings.xml
index 8a23136..87ba61b 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rHK/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rHK/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"闊身顯示屏凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"闊身凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rTW/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rTW/strings.xml
index 9d2921b..f5a57f5 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rTW/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zh-rTW/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"寬型螢幕凹口"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"寬型凹口"</string>
 </resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zu/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zu/strings.xml
index 4a96281..ccf0040 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zu/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-zu/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay" msgid="3249818092477753587">"Ukusikwa kwesiboniso esibanzi"</string>
+    <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Ukusika okubanzi"</string>
 </resources>
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index a20eece..b668623 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -6445,6 +6445,69 @@
     // OS: Q
     SETTINGS_GESTURE_REACH = 1557;
 
+    // OPEN: Emergency dialer opened
+    // CLOSE: Emergency dialer closed
+    //  SUBTYPE: The entry type that user opened emergency dialer
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    EMERGENCY_DIALER = 1558;
+
+    // FIELD: The screen is currently locked
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    FIELD_EMERGENCY_DIALER_IS_SCREEN_LOCKED = 1559;
+
+    // FIELD: Bit flag indicating the actions performed by user
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    FIELD_EMERGENCY_DIALER_USER_ACTIONS = 1560;
+
+    // FIELD: The duration user stayed at emergency dialer
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    FIELD_EMERGENCY_DIALER_DURATION_MS = 1561;
+
+    // ACTION: Making call via emergency dialer
+    //  SUBTYPE: The UI that user made phone call
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    EMERGENCY_DIALER_MAKE_CALL = 1562;
+
+    // FIELD: The phone number type of a call user made
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    FIELD_EMERGENCY_DIALER_PHONE_NUMBER_TYPE = 1563;
+
+    // FIELD: There is a shortcut for the phone number
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    FIELD_EMERGENCY_DIALER_PHONE_NUMBER_HAS_SHORTCUT = 1564;
+
+    // FIELD: The phone is in pocket while using emergency dialer
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    FIELD_EMERGENCY_DIALER_IN_POCKET = 1565;
+
+    // ACTION: The second tap on emergency shortcut to make a phone call
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    EMERGENCY_DIALER_SHORTCUT_CONFIRM_TAP = 1566;
+
+    // FIELD: The time in milliseconds of second tap on shortcut since first tap
+    // CATEGORY: EMERGENCY_DIALER
+    // OS: Q
+    FIELD_EMERGENCY_DIALER_SHORTCUT_TAPS_INTERVAL = 1567;
+
+    // OPEN: Power menu is opened
+    // CATEGORY: GLOBAL_SYSTEM_UI
+    // OS: Q
+    POWER_MENU = 1568;
+
+    // ACTION: User tapped emergency dialer icon in the power menu.
+    // CATEGORY: GLOBAL_SYSTEM_UI
+    // OS: Q
+    ACTION_EMERGENCY_DIALER_FROM_POWER_MENU = 1569;
+
     // ---- End Q Constants, all Q constants go above this line ----
 
     // Add new aosp constants above this line.
diff --git a/proto/src/stats_enums.proto b/proto/src/stats_enums.proto
new file mode 100644
index 0000000..6c892cf
--- /dev/null
+++ b/proto/src/stats_enums.proto
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package android.os.statsd;
+option java_package = "com.android.os";
+option java_outer_classname = "StatsEnums";
+
+enum EventType {
+  // Unknown.
+  TYPE_UNKNOWN = 0;
+}
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityGestureDetector.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityGestureDetector.java
index 075c2fe..d767011 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityGestureDetector.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityGestureDetector.java
@@ -145,7 +145,7 @@
 
     private final Listener mListener;
     private final Context mContext;  // Retained for on-demand construction of GestureDetector.
-    protected GestureDetector mGestureDetector;  // Double-tap detector. Visible for test.
+    private final GestureDetector mGestureDetector;  // Double-tap detector.
 
     // Indicates that a single tap has occurred.
     private boolean mFirstTapDetected;
@@ -216,10 +216,34 @@
     // cancelled.
     private static final long CANCEL_ON_PAUSE_THRESHOLD_STARTED_MS = 300;
 
+    /**
+     * Construct the gesture detector for {@link TouchExplorer}.
+     *
+     * @see #AccessibilityGestureDetector(Context, Listener, GestureDetector)
+     */
     AccessibilityGestureDetector(Context context, Listener listener) {
+        this(context, listener, null);
+    }
+
+    /**
+     * Construct the gesture detector for {@link TouchExplorer}.
+     *
+     * @param context A context handle for accessing resources.
+     * @param listener A listener to callback with gesture state or information.
+     * @param detector The gesture detector to handle touch event. If null the default one created
+     *                 in place, or for testing purpose.
+     */
+    AccessibilityGestureDetector(Context context, Listener listener, GestureDetector detector) {
         mListener = listener;
         mContext = context;
 
+        // Break the circular dependency between constructors and let the class to be testable
+        if (detector == null) {
+            mGestureDetector = new GestureDetector(context, this);
+        } else {
+            mGestureDetector = detector;
+        }
+        mGestureDetector.setOnDoubleTapListener(this);
         mGestureDetectionThreshold = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_MM, 1,
                 context.getResources().getDisplayMetrics()) * GESTURE_CONFIRM_MM;
 
@@ -244,18 +268,6 @@
      * @return true if the event is consumed, else false
      */
     public boolean onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
-
-        // Construct GestureDetector double-tap detector on demand, so that testable sub-class
-        // can use mock GestureDetector.
-        // TODO: Break the circular dependency between GestureDetector's constructor and
-        // AccessibilityGestureDetector's constructor. Construct GestureDetector in TouchExplorer,
-        // using a GestureDetector listener owned by TouchExplorer, which passes double-tap state
-        // information to AccessibilityGestureDetector.
-        if (mGestureDetector == null) {
-            mGestureDetector = new GestureDetector(mContext, this);
-            mGestureDetector.setOnDoubleTapListener(this);
-        }
-
         // The accessibility gesture detector is interested in the movements in physical space,
         // so it uses the rawEvent to ignore magnification and other transformations.
         final float x = rawEvent.getX();
diff --git a/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java
index 347a084..371f932 100644
--- a/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java
+++ b/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java
@@ -165,8 +165,9 @@
     /**
      * Creates a new instance.
      *
-     * @param inputFilter The input filter associated with this explorer.
      * @param context A context handle for accessing resources.
+     * @param service The service to notify touch interaction and gesture completed and to perform
+     *                action.
      */
     public TouchExplorer(Context context, AccessibilityManagerService service) {
         mContext = context;
@@ -1311,7 +1312,20 @@
 
     @Override
     public String toString() {
-        return LOG_TAG;
+        return "TouchExplorer { " +
+                "mCurrentState: " + getStateSymbolicName(mCurrentState) +
+                ", mDetermineUserIntentTimeout: " + mDetermineUserIntentTimeout +
+                ", mDoubleTapSlop: " + mDoubleTapSlop +
+                ", mDraggingPointerId: " + mDraggingPointerId +
+                ", mLongPressingPointerId: " + mLongPressingPointerId +
+                ", mLongPressingPointerDeltaX: " + mLongPressingPointerDeltaX +
+                ", mLongPressingPointerDeltaY: " + mLongPressingPointerDeltaY +
+                ", mLastTouchedWindowId: " + mLastTouchedWindowId +
+                ", mScaledMinPointerDistanceToUseMiddleLocation: "
+                + mScaledMinPointerDistanceToUseMiddleLocation +
+                ", mTempPoint: " + mTempPoint +
+                ", mTouchExplorationInProgress: " + mTouchExplorationInProgress +
+                " }";
     }
 
     class InjectedPointerTracker {
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
index 5771748..af33bd0 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
@@ -978,12 +978,12 @@
                 throw new IllegalArgumentException(packageName + " is not a valid package", e);
             }
 
-            // TODO(b/112051762): rather than always call AM here, call it on demand on
+            // TODO(b/113281366): rather than always call AM here, call it on demand on
             // getPreviousSessionsLocked()? That way we save space / time here, and don't set
             // a callback on AM unnecessarily (see TODO below :-)
             final ActivityManagerInternal am = LocalServices
                     .getService(ActivityManagerInternal.class);
-            // TODO(b/112051762): add a callback method on AM to be notified when a task is finished
+            // TODO(b/113281366): add a callback method on AM to be notified when a task is finished
             // so we can clean up sessions kept alive
             final int taskId = am.getTaskIdForActivity(activityToken, false);
             final int sessionId;
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
index 48b3798..8c8352f 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
@@ -617,7 +617,7 @@
         ArrayList<Session> previousSessions = null;
         for (int i = 0; i < size; i++) {
             final Session previousSession = mSessions.valueAt(i);
-            // TODO(b/112051762): only return sessions asked to be kept alive / add CTS test
+            // TODO(b/113281366): only return sessions asked to be kept alive / add CTS test
             if (previousSession.taskId == session.taskId && previousSession.id != session.id) {
                 if (previousSessions == null) {
                     previousSessions = new ArrayList<>(size);
@@ -625,7 +625,7 @@
                 previousSessions.add(previousSession);
             }
         }
-        // TODO(b/112051762): remove returned sessions / add CTS test
+        // TODO(b/113281366): remove returned sessions / add CTS test
         return previousSessions;
     }
 
diff --git a/services/autofill/java/com/android/server/autofill/FieldClassificationStrategy.java b/services/autofill/java/com/android/server/autofill/FieldClassificationStrategy.java
index 8ee6571..293f908e 100644
--- a/services/autofill/java/com/android/server/autofill/FieldClassificationStrategy.java
+++ b/services/autofill/java/com/android/server/autofill/FieldClassificationStrategy.java
@@ -17,8 +17,8 @@
 
 import static com.android.server.autofill.Helper.sDebug;
 import static com.android.server.autofill.Helper.sVerbose;
-import static android.service.autofill.AutofillFieldClassificationService.RESOURCE_AVAILABLE_ALGORITHMS;
-import static android.service.autofill.AutofillFieldClassificationService.RESOURCE_DEFAULT_ALGORITHM;
+import static android.service.autofill.AutofillFieldClassificationService.SERVICE_META_DATA_KEY_AVAILABLE_ALGORITHMS;
+import static android.service.autofill.AutofillFieldClassificationService.SERVICE_META_DATA_KEY_DEFAULT_ALGORITHM;
 
 import android.Manifest;
 import android.annotation.MainThread;
@@ -226,7 +226,7 @@
      */
     @Nullable
     String[] getAvailableAlgorithms() {
-        return getMetadataValue(RESOURCE_AVAILABLE_ALGORITHMS, "array",
+        return getMetadataValue(SERVICE_META_DATA_KEY_AVAILABLE_ALGORITHMS,
                 (res, id) -> res.getStringArray(id));
     }
 
@@ -235,12 +235,11 @@
      */
     @Nullable
     String getDefaultAlgorithm() {
-        return getMetadataValue(RESOURCE_DEFAULT_ALGORITHM, "string",
-                (res, id) -> res.getString(id));
+        return getMetadataValue(SERVICE_META_DATA_KEY_DEFAULT_ALGORITHM, (res, id) -> res.getString(id));
     }
 
     @Nullable
-    private <T> T getMetadataValue(String field, String type, MetadataParser<T> parser) {
+    private <T> T getMetadataValue(String field, MetadataParser<T> parser) {
         final ServiceInfo serviceInfo = getServiceInfo();
         if (serviceInfo == null) return null;
 
@@ -254,7 +253,7 @@
             return null;
         }
 
-        final int resourceId = res.getIdentifier(field, type, serviceInfo.packageName);
+        final int resourceId = serviceInfo.metaData.getInt(field);
         return parser.get(res, resourceId);
     }
 
diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 5a10c1e..5b7332d 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -75,6 +75,7 @@
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.LocalLog;
+import android.util.Pair;
 import android.util.Slog;
 import android.util.SparseArray;
 import android.util.TimeUtils;
@@ -329,12 +330,9 @@
                     fillContextWithAllowedValuesLocked(mContexts.get(i), flags);
                 }
 
-                // Dispatch a snapshot of the current contexts list since it may change
-                // until the dispatch happens. The items in the list don't need to be cloned
-                // since we don't hold on them anywhere else. The client state is not touched
-                // by us, so no need to copy.
-                request = new FillRequest(requestId, new ArrayList<>(mContexts), mClientState,
-                        flags);
+                final ArrayList<FillContext> contexts =
+                        mergePreviousSessionLocked(/* forSave= */ false);
+                request = new FillRequest(requestId, contexts, mClientState, flags);
             }
 
             mRemoteFillService.onFillRequest(request);
@@ -1465,7 +1463,7 @@
         }
 
         if ((saveInfo.getFlags() & SaveInfo.FLAG_DELAY_SAVE) != 0) {
-            // TODO(b/112051762): log metrics
+            // TODO(b/113281366): log metrics
             if (sDebug) Slog.v(TAG, "showSaveLocked(): service asked to delay save");
             return false;
         }
@@ -1890,13 +1888,38 @@
         // Remove pending fill requests as the session is finished.
         cancelCurrentRequestLocked();
 
-        // Merge the previous sessions that the service asked to be kept alive
+        final ArrayList<FillContext> contexts = mergePreviousSessionLocked( /* forSave= */ true);
+
+        final SaveRequest saveRequest =
+                new SaveRequest(contexts, mClientState, mSelectedDatasetIds);
+        mRemoteFillService.onSaveRequest(saveRequest);
+    }
+
+    // TODO(b/113281366): rather than merge it here, it might be better to simply reuse the old
+    // session instead of creating a new one. But we need to consider what would happen on corner
+    // cases such as "Main Activity M -> activity A with username -> activity B with password"
+    // If user follows the normal workflow, than session A would be merged with session B as
+    // expected. But if when on Activity A the user taps back or somehow launches another activity,
+    // session A could be merged with the wrong session.
+    /**
+     * Gets a list of contexts that includes not only this session's contexts but also the contexts
+     * from previous sessions that were asked by the service to be delayed (if any).
+     *
+     * <p>As a side-effect:
+     * <ul>
+     *   <li>If the current {@link #mClientState} is {@code null}, sets it with the last non-
+     *   {@code null} client state from previous sessions.
+     *   <li>When {@code forSave} is {@code true}, calls {@link #updateValuesForSaveLocked()} in the
+     *   previous sessions.
+     * </ul>
+     */
+    @NonNull
+    private ArrayList<FillContext> mergePreviousSessionLocked(boolean forSave) {
         final ArrayList<Session> previousSessions = mService.getPreviousSessionsLocked(this);
         final ArrayList<FillContext> contexts;
-        final Bundle clientState;
         if (previousSessions != null) {
             if (sDebug) {
-                Slog.d(TAG, "callSaveLocked(): Merging the content of " + previousSessions.size()
+                Slog.d(TAG, "mergeSessions(): Merging the content of " + previousSessions.size()
                         + " sessions for task " + taskId);
             }
             contexts = new ArrayList<>();
@@ -1904,31 +1927,35 @@
                 final Session previousSession = previousSessions.get(i);
                 final ArrayList<FillContext> previousContexts = previousSession.mContexts;
                 if (previousContexts == null) {
-                    Slog.w(TAG, "callSaveLocked(): Not merging null contexts from "
+                    Slog.w(TAG, "mergeSessions(): Not merging null contexts from "
                             + previousSession.id);
                     continue;
                 }
-                previousSession.updateValuesForSaveLocked();
-                if (sVerbose) {
-                    Slog.v(TAG, "callSaveLocked(): adding " + previousContexts.size()
+                if (forSave) {
+                    previousSession.updateValuesForSaveLocked();
+                }
+                if (sDebug) {
+                    Slog.d(TAG, "mergeSessions(): adding " + previousContexts.size()
                             + " context from previous session #" + previousSession.id);
                 }
                 contexts.addAll(previousContexts);
+                if (mClientState == null && previousSession.mClientState != null) {
+                    if (sDebug) {
+                        Slog.d(TAG, "mergeSessions(): setting client state from previous session"
+                                + previousSession.id);
+                    }
+                    mClientState = previousSession.mClientState;
+                }
             }
             contexts.addAll(mContexts);
-            // TODO(b/112051762): decided what to do with client state / add CTS test
-            clientState = mClientState;
         } else {
             // Dispatch a snapshot of the current contexts list since it may change
             // until the dispatch happens. The items in the list don't need to be cloned
             // since we don't hold on them anywhere else. The client state is not touched
             // by us, so no need to copy.
             contexts = new ArrayList<>(mContexts);
-            clientState = mClientState;
         }
-
-        final SaveRequest saveRequest = new SaveRequest(contexts, clientState, mSelectedDatasetIds);
-        mRemoteFillService.onSaveRequest(saveRequest);
+        return contexts;
     }
 
     /**
diff --git a/services/backup/java/com/android/server/backup/BackupAgentTimeoutParameters.java b/services/backup/java/com/android/server/backup/BackupAgentTimeoutParameters.java
index 49fa1cc..df46d260b 100644
--- a/services/backup/java/com/android/server/backup/BackupAgentTimeoutParameters.java
+++ b/services/backup/java/com/android/server/backup/BackupAgentTimeoutParameters.java
@@ -57,6 +57,10 @@
     public static final String SETTING_RESTORE_AGENT_FINISHED_TIMEOUT_MILLIS =
             "restore_agent_finished_timeout_millis";
 
+    @VisibleForTesting
+    public static final String SETTING_QUOTA_EXCEEDED_TIMEOUT_MILLIS =
+            "quota_exceeded_timeout_millis";
+
     // Default values
     @VisibleForTesting public static final long DEFAULT_KV_BACKUP_AGENT_TIMEOUT_MILLIS = 30 * 1000;
 
@@ -71,6 +75,9 @@
     @VisibleForTesting
     public static final long DEFAULT_RESTORE_AGENT_FINISHED_TIMEOUT_MILLIS = 30 * 1000;
 
+    @VisibleForTesting
+    public static final long DEFAULT_QUOTA_EXCEEDED_TIMEOUT_MILLIS = 3 * 1000;
+
     @GuardedBy("mLock")
     private long mKvBackupAgentTimeoutMillis;
 
@@ -86,6 +93,9 @@
     @GuardedBy("mLock")
     private long mRestoreAgentFinishedTimeoutMillis;
 
+    @GuardedBy("mLock")
+    private long mQuotaExceededTimeoutMillis;
+
     private final Object mLock = new Object();
 
     public BackupAgentTimeoutParameters(Handler handler, ContentResolver resolver) {
@@ -118,6 +128,10 @@
                     parser.getLong(
                             SETTING_RESTORE_AGENT_FINISHED_TIMEOUT_MILLIS,
                             DEFAULT_RESTORE_AGENT_FINISHED_TIMEOUT_MILLIS);
+            mQuotaExceededTimeoutMillis =
+                    parser.getLong(
+                            SETTING_QUOTA_EXCEEDED_TIMEOUT_MILLIS,
+                            DEFAULT_QUOTA_EXCEEDED_TIMEOUT_MILLIS);
         }
     }
 
@@ -170,4 +184,16 @@
             return mRestoreAgentFinishedTimeoutMillis;
         }
     }
+
+    public long getQuotaExceededTimeoutMillis() {
+        synchronized (mLock) {
+            if (BackupManagerService.DEBUG_SCHEDULING) {
+                Slog.v(
+                        TAG,
+                        "getQuotaExceededTimeoutMillis(): "
+                                + mQuotaExceededTimeoutMillis);
+            }
+            return mQuotaExceededTimeoutMillis;
+        }
+    }
 }
diff --git a/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java b/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java
index 5694659..16906f7 100644
--- a/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java
+++ b/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java
@@ -46,6 +46,7 @@
 import com.android.server.backup.BackupAgentTimeoutParameters;
 import com.android.server.backup.BackupManagerService;
 import com.android.server.backup.BackupRestoreTask;
+import com.android.server.backup.remote.RemoteCall;
 import com.android.server.backup.utils.FullBackupUtils;
 
 import java.io.BufferedOutputStream;
@@ -270,10 +271,12 @@
         return result;
     }
 
-    public void sendQuotaExceeded(final long backupDataBytes, final long quotaBytes) {
+    public void sendQuotaExceeded(long backupDataBytes, long quotaBytes) {
         if (initializeAgent()) {
             try {
-                mAgent.doQuotaExceeded(backupDataBytes, quotaBytes);
+                RemoteCall.execute(
+                        callback -> mAgent.doQuotaExceeded(backupDataBytes, quotaBytes, callback),
+                        mAgentTimeoutParameters.getQuotaExceededTimeoutMillis());
             } catch (RemoteException e) {
                 Slog.e(TAG, "Remote exception while telling agent about quota exceeded");
             }
diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java
index f7c1c10..e108026 100644
--- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java
+++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java
@@ -51,6 +51,7 @@
 import com.android.server.backup.TransportManager;
 import com.android.server.backup.internal.OnTaskFinishedListener;
 import com.android.server.backup.internal.Operation;
+import com.android.server.backup.remote.RemoteCall;
 import com.android.server.backup.transport.TransportClient;
 import com.android.server.backup.transport.TransportNotAvailableException;
 import com.android.server.backup.utils.AppBackupUtils;
@@ -739,7 +740,9 @@
                         Slog.d(TAG, "Package hit quota limit on preflight " +
                                 pkg.packageName + ": " + totalSize + " of " + mQuota);
                     }
-                    agent.doQuotaExceeded(totalSize, mQuota);
+                    RemoteCall.execute(
+                            callback -> agent.doQuotaExceeded(totalSize, mQuota, callback),
+                            mAgentTimeoutParameters.getQuotaExceededTimeoutMillis());
                 }
             } catch (Exception e) {
                 Slog.w(TAG, "Exception preflighting " + pkg.packageName + ": " + e.getMessage());
diff --git a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupReporter.java b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupReporter.java
index 8fbca4b..54e6b1d 100644
--- a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupReporter.java
+++ b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupReporter.java
@@ -26,6 +26,7 @@
 import android.util.EventLog;
 import android.util.Slog;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.server.EventLogTags;
 import com.android.server.backup.BackupManagerService;
 import com.android.server.backup.DataChangedJournal;
@@ -49,10 +50,17 @@
  */
 // TODO: In KeyValueBackupTaskTest, remove direct assertions on logcat, observer or monitor and
 //       verify calls to this object. Add these and more assertions to the test of this class.
-class KeyValueBackupReporter {
-    private static final String TAG = "KeyValueBackupTask";
+@VisibleForTesting
+public class KeyValueBackupReporter {
+    @VisibleForTesting static final String TAG = "KeyValueBackupTask";
     private static final boolean DEBUG = BackupManagerService.DEBUG;
-    private static final boolean MORE_DEBUG = BackupManagerService.MORE_DEBUG || true;
+    @VisibleForTesting static final boolean MORE_DEBUG = BackupManagerService.MORE_DEBUG || true;
+
+    static void onNewThread(String threadName) {
+        if (DEBUG) {
+            Slog.d(TAG, "Spinning thread " + threadName);
+        }
+    }
 
     private final BackupManagerService mBackupManagerService;
     private final IBackupObserver mObserver;
@@ -61,7 +69,7 @@
     KeyValueBackupReporter(
             BackupManagerService backupManagerService,
             IBackupObserver observer,
-            IBackupManagerMonitor monitor) {
+            @Nullable IBackupManagerMonitor monitor) {
         mBackupManagerService = backupManagerService;
         mObserver = observer;
         mMonitor = monitor;
@@ -73,6 +81,10 @@
         return mMonitor;
     }
 
+    IBackupObserver getObserver() {
+        return mObserver;
+    }
+
     void onSkipBackup() {
         if (DEBUG) {
             Slog.d(TAG, "Skipping backup since one is already in progress");
@@ -118,12 +130,6 @@
         Slog.e(TAG, "Error during PM metadata backup", e);
     }
 
-    void onEmptyQueue() {
-        if (MORE_DEBUG) {
-            Slog.i(TAG, "Queue now empty");
-        }
-    }
-
     void onStartPackageBackup(String packageName) {
         Slog.d(TAG, "Starting key-value backup of " + packageName);
     }
@@ -237,10 +243,6 @@
         }
     }
 
-    void onTruncateDataError() {
-        Slog.w(TAG, "Unable to roll back");
-    }
-
     void onSendDataToTransport(String packageName) {
         if (MORE_DEBUG) {
             Slog.v(TAG, "Sending non-empty data to transport for " + packageName);
@@ -353,11 +355,19 @@
                                 null, BackupManagerMonitor.EXTRA_LOG_CANCEL_ALL, true));
     }
 
+    void onAgentResultError(@Nullable PackageInfo packageInfo) {
+        String packageName = getPackageName(packageInfo);
+        BackupObserverUtils.sendBackupOnPackageResult(
+                mObserver, packageName, BackupManager.ERROR_AGENT_FAILURE);
+        EventLog.writeEvent(EventLogTags.BACKUP_AGENT_FAILURE, packageName, "result error");
+        Slog.w(TAG, "Agent " + packageName + " error in onBackup()");
+    }
+
     private String getPackageName(@Nullable PackageInfo packageInfo) {
         return (packageInfo != null) ? packageInfo.packageName : "no_package_yet";
     }
 
-    void onRevertBackup() {
+    void onRevertTask() {
         if (MORE_DEBUG) {
             Slog.i(TAG, "Reverting backup queue, re-staging everything");
         }
@@ -367,9 +377,9 @@
         Slog.w(TAG, "Unable to contact transport for recommended backoff: " + e);
     }
 
-    void onRemoteCallReturned(RemoteResult result) {
+    void onRemoteCallReturned(RemoteResult result, String logIdentifier) {
         if (MORE_DEBUG) {
-            Slog.v(TAG, "Agent call returned " + result);
+            Slog.v(TAG, "Agent call " + logIdentifier + " returned " + result);
         }
     }
 
@@ -391,6 +401,10 @@
         Slog.w(TAG, "Failed to query transport name for pending init: " + e);
     }
 
+    /**
+     * This is a bit different from {@link #onTaskFinished()}, it's only called if there is no
+     * full-backup requests associated with the key-value task.
+     */
     void onBackupFinished(int status) {
         BackupObserverUtils.sendBackupFinished(mObserver, status);
     }
@@ -399,7 +413,7 @@
         Slog.d(TAG, "Starting full backups for: " + pendingFullBackups);
     }
 
-    void onKeyValueBackupFinished() {
+    void onTaskFinished() {
         Slog.i(TAG, "K/V backup pass finished");
     }
 }
diff --git a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java
index 91af6f1..a4cd629 100644
--- a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java
+++ b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java
@@ -24,7 +24,6 @@
 import static com.android.server.backup.BackupManagerService.KEY_WIDGET_STATE;
 import static com.android.server.backup.BackupManagerService.OP_PENDING;
 import static com.android.server.backup.BackupManagerService.OP_TYPE_BACKUP;
-import static com.android.server.backup.BackupManagerService.PACKAGE_MANAGER_SENTINEL;
 
 import android.annotation.Nullable;
 import android.app.ApplicationThreadConstants;
@@ -48,11 +47,9 @@
 import android.os.SELinux;
 import android.os.UserHandle;
 import android.os.WorkSource;
-import android.system.ErrnoException;
-import android.system.Os;
 import android.util.Pair;
-import android.util.Slog;
 
+import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.backup.IBackupTransport;
 import com.android.internal.util.Preconditions;
@@ -172,9 +169,6 @@
 // TODO: Consider having the caller responsible for some clean-up (like resetting state)
 // TODO: Distinguish between cancel and time-out where possible for logging/monitoring/observing
 public class KeyValueBackupTask implements BackupRestoreTask, Runnable {
-    private static final String TAG = "KeyValueBackupTask";
-    private static final boolean DEBUG = BackupManagerService.DEBUG;
-    private static final boolean MORE_DEBUG = BackupManagerService.MORE_DEBUG || false;
     private static final int THREAD_PRIORITY = Process.THREAD_PRIORITY_BACKGROUND;
     private static final AtomicInteger THREAD_COUNT = new AtomicInteger();
     private static final String BLANK_STATE_FILE_NAME = "blank_state";
@@ -218,6 +212,8 @@
             List<String> pendingFullBackups,
             boolean userInitiated,
             boolean nonIncremental) {
+        KeyValueBackupReporter reporter =
+                new KeyValueBackupReporter(backupManagerService, observer, monitor);
         KeyValueBackupTask task =
                 new KeyValueBackupTask(
                         backupManagerService,
@@ -225,17 +221,14 @@
                         transportDirName,
                         queue,
                         dataChangedJournal,
-                        observer,
-                        monitor,
+                        reporter,
                         listener,
                         pendingFullBackups,
                         userInitiated,
                         nonIncremental);
         Thread thread = new Thread(task, "key-value-backup-" + THREAD_COUNT.incrementAndGet());
-        if (DEBUG) {
-            Slog.d(TAG, "Spinning thread " + thread.getName());
-        }
         thread.start();
+        KeyValueBackupReporter.onNewThread(thread.getName());
         return task;
     }
 
@@ -244,28 +237,29 @@
     private final TransportManager mTransportManager;
     private final TransportClient mTransportClient;
     private final BackupAgentTimeoutParameters mAgentTimeoutParameters;
-    private final IBackupObserver mObserver;
     private final KeyValueBackupReporter mReporter;
     private final OnTaskFinishedListener mTaskFinishedListener;
     private final boolean mUserInitiated;
     private final boolean mNonIncremental;
     private final int mCurrentOpToken;
-    private final File mStateDir;
+    private final File mStateDirectory;
+    private final File mDataDirectory;
     private final List<String> mOriginalQueue;
     private final List<String> mQueue;
     private final List<String> mPendingFullBackups;
+    private final Object mQueueLock;
     @Nullable private final DataChangedJournal mJournal;
     @Nullable private PerformFullTransportBackupTask mFullBackupTask;
 
-    private IBackupAgent mAgentBinder;
-    private PackageInfo mCurrentPackage;
-    private File mSavedStateFile;
-    private File mBackupDataFile;
-    private File mNewStateFile;
-    private ParcelFileDescriptor mSavedState;
-    private ParcelFileDescriptor mBackupData;
-    private ParcelFileDescriptor mNewState;
     private int mStatus;
+    @Nullable private IBackupAgent mAgentBinder;
+    @Nullable private PackageInfo mCurrentPackage;
+    @Nullable private File mSavedStateFile;
+    @Nullable private File mBackupDataFile;
+    @Nullable private File mNewStateFile;
+    @Nullable private ParcelFileDescriptor mSavedState;
+    @Nullable private ParcelFileDescriptor mBackupData;
+    @Nullable private ParcelFileDescriptor mNewState;
 
     /**
      * This {@link ConditionVariable} is used to signal that the cancel operation has been
@@ -296,8 +290,7 @@
             String transportDirName,
             List<String> queue,
             @Nullable DataChangedJournal journal,
-            IBackupObserver observer,
-            @Nullable IBackupManagerMonitor monitor,
+            KeyValueBackupReporter reporter,
             OnTaskFinishedListener taskFinishedListener,
             List<String> pendingFullBackups,
             boolean userInitiated,
@@ -310,8 +303,7 @@
         // We need to retain the original queue contents in case of transport failure
         mQueue = new ArrayList<>(queue);
         mJournal = journal;
-        mObserver = observer;
-        mReporter = new KeyValueBackupReporter(backupManagerService, observer, monitor);
+        mReporter = reporter;
         mTaskFinishedListener = taskFinishedListener;
         mPendingFullBackups = pendingFullBackups;
         mUserInitiated = userInitiated;
@@ -320,8 +312,10 @@
                 Preconditions.checkNotNull(
                         backupManagerService.getAgentTimeoutParameters(),
                         "Timeout parameters cannot be null");
-        mStateDir = new File(backupManagerService.getBaseStateDir(), transportDirName);
+        mStateDirectory = new File(backupManagerService.getBaseStateDir(), transportDirName);
+        mDataDirectory = mBackupManagerService.getDataDir();
         mCurrentOpToken = backupManagerService.generateRandomIntegerToken();
+        mQueueLock = mBackupManagerService.getQueueLock();
     }
 
     private void registerTask() {
@@ -337,44 +331,45 @@
     public void run() {
         Process.setThreadPriority(THREAD_PRIORITY);
 
-        BackupState state = startBackup();
-        while (state == BackupState.RUNNING_QUEUE || state == BackupState.BACKUP_PM) {
-            if (mCancelled) {
-                state = BackupState.CANCELLED;
-            }
-            switch (state) {
-                case BACKUP_PM:
-                    state = backupPm();
-                    break;
-                case RUNNING_QUEUE:
-                    Pair<BackupState, RemoteResult> stateAndResult = extractNextAgentData();
-                    state = stateAndResult.first;
-                    if (state == null) {
-                        state = handleAgentResult(stateAndResult.second);
-                    }
-                    break;
+        boolean processQueue = startTask();
+        while (processQueue && !mQueue.isEmpty() && !mCancelled) {
+            String packageName = mQueue.remove(0);
+            if (PM_PACKAGE.equals(packageName)) {
+                processQueue = backupPm();
+            } else {
+                processQueue = backupPackage(packageName);
             }
         }
-        finishBackup();
+        finishTask();
     }
 
-    private BackupState handleAgentResult(RemoteResult result) {
+    /** Returns whether to consume next queue package. */
+    private boolean handleAgentResult(@Nullable PackageInfo packageInfo, RemoteResult result) {
         if (result == RemoteResult.FAILED_THREAD_INTERRUPTED) {
             // Not an explicit cancel, we need to flag it.
             mCancelled = true;
-            handleAgentCancelled();
-            return BackupState.CANCELLED;
+            mReporter.onAgentCancelled(packageInfo);
+            errorCleanup();
+            return false;
         }
         if (result == RemoteResult.FAILED_CANCELLED) {
-            handleAgentCancelled();
-            return BackupState.CANCELLED;
+            mReporter.onAgentCancelled(packageInfo);
+            errorCleanup();
+            return false;
         }
         if (result == RemoteResult.FAILED_TIMED_OUT) {
-            handleAgentTimeout();
-            return BackupState.RUNNING_QUEUE;
+            mReporter.onAgentTimedOut(packageInfo);
+            errorCleanup();
+            return true;
         }
-        Preconditions.checkState(result.succeeded());
-        return sendDataToTransport(result.get());
+        Preconditions.checkState(result.isPresent());
+        long agentResult = result.get();
+        if (agentResult == BackupAgent.RESULT_ERROR) {
+            mReporter.onAgentResultError(packageInfo);
+            errorCleanup();
+            return true;
+        }
+        return sendDataToTransport();
     }
 
     @Override
@@ -383,11 +378,12 @@
     @Override
     public void operationComplete(long unusedResult) {}
 
-    private BackupState startBackup() {
+    /** Returns whether to consume next queue package. */
+    private boolean startTask() {
         synchronized (mBackupManagerService.getCurrentOpLock()) {
             if (mBackupManagerService.isBackupOperationInProgress()) {
                 mReporter.onSkipBackup();
-                return BackupState.FINAL;
+                return false;
             }
         }
 
@@ -401,7 +397,7 @@
                         /* updateSchedule */ false,
                         /* runningJob */ null,
                         new CountDownLatch(1),
-                        mObserver,
+                        mReporter.getObserver(),
                         mReporter.getMonitor(),
                         mTaskFinishedListener,
                         mUserInitiated);
@@ -410,26 +406,30 @@
         mAgentBinder = null;
         mStatus = BackupTransport.TRANSPORT_OK;
 
-        // Sanity check: if the queue is empty we have no work to do.
-        if (mOriginalQueue.isEmpty() && mPendingFullBackups.isEmpty()) {
+        if (mQueue.isEmpty() && mPendingFullBackups.isEmpty()) {
             mReporter.onEmptyQueueAtStart();
-            return BackupState.FINAL;
+            return false;
         }
 
         // We only backup PM if it was explicitly in the queue or if it's incremental.
         boolean backupPm = mQueue.remove(PM_PACKAGE) || !mNonIncremental;
+        if (backupPm) {
+            mQueue.add(0, PM_PACKAGE);
+        } else {
+            mReporter.onSkipPm();
+        }
 
         mReporter.onQueueReady(mQueue);
-        File pmState = new File(mStateDir, PM_PACKAGE);
+        File pmState = new File(mStateDirectory, PM_PACKAGE);
         try {
-            IBackupTransport transport = mTransportClient.connectOrThrow("KVBT.startBackup()");
+            IBackupTransport transport = mTransportClient.connectOrThrow("KVBT.startTask()");
             String transportName = transport.name();
             mReporter.onTransportReady(transportName);
 
             // If we haven't stored PM metadata yet, we must initialize the transport.
             if (pmState.length() <= 0) {
                 mReporter.onInitializeTransport(transportName);
-                mBackupManagerService.resetBackupState(mStateDir);
+                mBackupManagerService.resetBackupState(mStateDirectory);
                 mStatus = transport.initializeDevice();
                 mReporter.onTransportInitialized(mStatus);
             }
@@ -439,19 +439,15 @@
         }
 
         if (mStatus != BackupTransport.TRANSPORT_OK) {
-            mBackupManagerService.resetBackupState(mStateDir);
-            return BackupState.FINAL;
+            mBackupManagerService.resetBackupState(mStateDirectory);
+            return false;
         }
 
-        if (!backupPm) {
-            mReporter.onSkipPm();
-            return BackupState.RUNNING_QUEUE;
-        }
-
-        return BackupState.BACKUP_PM;
+        return true;
     }
 
-    private BackupState backupPm() {
+    /** Returns whether to consume next queue package. */
+    private boolean backupPm() {
         RemoteResult agentResult = null;
         try {
             mCurrentPackage = new PackageInfo();
@@ -471,32 +467,18 @@
         }
 
         if (mStatus != BackupTransport.TRANSPORT_OK) {
-            mBackupManagerService.resetBackupState(mStateDir);
-            return BackupState.FINAL;
+            mBackupManagerService.resetBackupState(mStateDirectory);
+            return false;
         }
 
         Preconditions.checkNotNull(agentResult);
-        return handleAgentResult(agentResult);
+        return handleAgentResult(mCurrentPackage, agentResult);
     }
 
-    /**
-     * Returns either:
-     *
-     * <ul>
-     *   <li>(next state, {@code null}): In case we failed to call the agent.
-     *   <li>({@code null}, agent result): In case we successfully called the agent.
-     * </ul>
-     */
-    private Pair<BackupState, RemoteResult> extractNextAgentData() {
-        mStatus = BackupTransport.TRANSPORT_OK;
-
-        if (mQueue.isEmpty()) {
-            mReporter.onEmptyQueue();
-            return Pair.create(BackupState.FINAL, null);
-        }
-
-        String packageName = mQueue.remove(0);
+    /** Returns whether to consume next queue package. */
+    private boolean backupPackage(String packageName) {
         mReporter.onStartPackageBackup(packageName);
+        mStatus = BackupTransport.TRANSPORT_OK;
 
         // Verify that the requested app is eligible for key-value backup.
         RemoteResult agentResult = null;
@@ -508,19 +490,19 @@
                 // The manifest has changed. This won't happen again because the app won't be
                 // requesting further backups.
                 mReporter.onPackageNotEligibleForBackup(packageName);
-                return Pair.create(BackupState.RUNNING_QUEUE, null);
+                return true;
             }
 
             if (AppBackupUtils.appGetsFullBackup(mCurrentPackage)) {
                 // Initially enqueued for key-value backup, but only supports full-backup now.
                 mReporter.onPackageEligibleForFullBackup(packageName);
-                return Pair.create(BackupState.RUNNING_QUEUE, null);
+                return true;
             }
 
             if (AppBackupUtils.appIsStopped(applicationInfo)) {
                 // Just as it won't receive broadcasts, we won't run it for backup.
                 mReporter.onPackageStopped(packageName);
-                return Pair.create(BackupState.RUNNING_QUEUE, null);
+                return true;
             }
 
             try {
@@ -556,25 +538,25 @@
                 mReporter.onAgentError(packageName);
                 mBackupManagerService.dataChangedImpl(packageName);
                 mStatus = BackupTransport.TRANSPORT_OK;
-                return Pair.create(BackupState.RUNNING_QUEUE, null);
+                return true;
             }
 
             if (mStatus == BackupTransport.AGENT_UNKNOWN) {
                 mReporter.onAgentUnknown(packageName);
                 mStatus = BackupTransport.TRANSPORT_OK;
-                return Pair.create(BackupState.RUNNING_QUEUE, null);
+                return true;
             }
 
             // Transport-level failure, re-enqueue everything.
-            revertBackup();
-            return Pair.create(BackupState.FINAL, null);
+            revertTask();
+            return false;
         }
 
-        // Success: caller will figure out the state based on call result
-        return Pair.create(null, agentResult);
+        Preconditions.checkNotNull(agentResult);
+        return handleAgentResult(mCurrentPackage, agentResult);
     }
 
-    private void finishBackup() {
+    private void finishTask() {
         // Mark packages that we couldn't backup as pending backup.
         for (String packageName : mQueue) {
             mBackupManagerService.dataChangedImpl(packageName);
@@ -586,7 +568,7 @@
             mReporter.onJournalDeleteFailed(mJournal);
         }
 
-        String callerLogString = "KVBT.finishBackup()";
+        String callerLogString = "KVBT.finishTask()";
 
         // If we succeeded and this is the first time we've done a backup, we can record the current
         // backup dataset token.
@@ -602,23 +584,16 @@
             }
         }
 
-        synchronized (mBackupManagerService.getQueueLock()) {
+        synchronized (mQueueLock) {
             mBackupManagerService.setBackupRunning(false);
             if (mStatus == BackupTransport.TRANSPORT_NOT_INITIALIZED) {
                 mReporter.onTransportNotInitialized();
-                try {
-                    IBackupTransport transport = mTransportClient.connectOrThrow(callerLogString);
-                    mBackupManagerService.getPendingInits().add(transport.name());
-                    clearPmMetadata();
-                    mBackupManagerService.backupNow();
-                } catch (Exception e) {
-                    mReporter.onPendingInitializeTransportError(e);
-                }
+                triggerTransportInitializationLocked();
             }
         }
 
         unregisterTask();
-        mReporter.onKeyValueBackupFinished();
+        mReporter.onTaskFinished();
 
         if (mCancelled) {
             // We acknowledge the cancel as soon as we unregister the task, allowing other backups
@@ -663,14 +638,25 @@
         }
     }
 
-    /** Removes PM state, triggering initialization in the next key-value task. */
-    private void clearPmMetadata() {
-        File pmState = new File(mStateDir, PM_PACKAGE);
-        if (pmState.exists()) {
-            pmState.delete();
+    @GuardedBy("mQueueLock")
+    private void triggerTransportInitializationLocked() {
+        try {
+            IBackupTransport transport =
+                    mTransportClient.connectOrThrow("KVBT.triggerTransportInitializationLocked");
+            mBackupManagerService.getPendingInits().add(transport.name());
+            deletePmStateFile();
+            mBackupManagerService.backupNow();
+        } catch (Exception e) {
+            mReporter.onPendingInitializeTransportError(e);
+            mStatus = BackupTransport.TRANSPORT_ERROR;
         }
     }
 
+    /** Removes PM state, triggering initialization in the next key-value task. */
+    private void deletePmStateFile() {
+        new File(mStateDirectory, PM_PACKAGE).delete();
+    }
+
     /**
      * Returns a {@link Pair}. The first of the pair contains the status. In case the status is
      * {@link BackupTransport#TRANSPORT_OK}, the second of the pair contains the agent result,
@@ -679,12 +665,10 @@
     private Pair<Integer, RemoteResult> extractAgentData(String packageName, IBackupAgent agent) {
         mReporter.onExtractAgentData(packageName);
 
-        File blankStateFile = new File(mStateDir, BLANK_STATE_FILE_NAME);
-        mSavedStateFile = new File(mStateDir, packageName);
-        File savedStateFileForAgent = (mNonIncremental) ? blankStateFile : mSavedStateFile;
-        mBackupDataFile =
-                new File(mBackupManagerService.getDataDir(), packageName + STAGING_FILE_SUFFIX);
-        mNewStateFile = new File(mStateDir, packageName + NEW_STATE_FILE_SUFFIX);
+        File blankStateFile = new File(mStateDirectory, BLANK_STATE_FILE_NAME);
+        mSavedStateFile = new File(mStateDirectory, packageName);
+        mBackupDataFile = new File(mDataDirectory, packageName + STAGING_FILE_SUFFIX);
+        mNewStateFile = new File(mStateDirectory, packageName + NEW_STATE_FILE_SUFFIX);
         mReporter.onAgentFilesReady(mBackupDataFile);
 
         mSavedState = null;
@@ -694,6 +678,7 @@
         boolean callingAgent = false;
         final RemoteResult agentResult;
         try {
+            File savedStateFileForAgent = (mNonIncremental) ? blankStateFile : mSavedStateFile;
             // MODE_CREATE to make an empty file if necessary
             mSavedState = ParcelFileDescriptor.open(
                     savedStateFileForAgent, MODE_READ_ONLY | MODE_CREATE);
@@ -709,8 +694,6 @@
             IBackupTransport transport = mTransportClient.connectOrThrow("KVBT.extractAgentData()");
             long quota = transport.getBackupQuota(packageName, /* isFullBackup */ false);
             int transportFlags = transport.getTransportFlags();
-            long kvBackupAgentTimeoutMillis =
-                    mAgentTimeoutParameters.getKvBackupAgentTimeoutMillis();
 
             callingAgent = true;
             agentResult =
@@ -723,7 +706,8 @@
                                             quota,
                                             callback,
                                             transportFlags),
-                            kvBackupAgentTimeoutMillis);
+                            mAgentTimeoutParameters.getKvBackupAgentTimeoutMillis(),
+                            "doBackup()");
         } catch (Exception e) {
             mReporter.onCallAgentDoBackupError(packageName, callingAgent, e);
             errorCleanup();
@@ -737,7 +721,7 @@
         return Pair.create(BackupTransport.TRANSPORT_OK, agentResult);
     }
 
-    private void failAgent(IBackupAgent agent, String message) {
+    private void agentFail(IBackupAgent agent, String message) {
         try {
             agent.fail(message);
         } catch (Exception e) {
@@ -767,7 +751,7 @@
             throws IOException {
         // TODO: http://b/22388012
         byte[] widgetState = AppWidgetBackupBridge.getWidgetState(pkgName, UserHandle.USER_SYSTEM);
-        File widgetFile = new File(mStateDir, pkgName + "_widget");
+        File widgetFile = new File(mStateDirectory, pkgName + "_widget");
         boolean priorStateExists = widgetFile.exists();
         if (!priorStateExists && widgetState == null) {
             return;
@@ -814,159 +798,167 @@
         }
     }
 
-    private BackupState sendDataToTransport(long agentResult) {
+    /** Returns whether to consume next queue package. */
+    private boolean sendDataToTransport() {
         Preconditions.checkState(mBackupData != null);
 
         String packageName = mCurrentPackage.packageName;
         ApplicationInfo applicationInfo = mCurrentPackage.applicationInfo;
-        long filePos = mBackupDataFile.length();
-        FileDescriptor fd = mBackupData.getFileDescriptor();
+
         boolean writingWidgetData = false;
         try {
-            // If it's a 3rd party app, crash them if they wrote any protected keys.
-            if (applicationInfo != null &&
-                    (applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-                ParcelFileDescriptor readFd =
-                        ParcelFileDescriptor.open(mBackupDataFile, MODE_READ_ONLY);
-                BackupDataInput in = new BackupDataInput(readFd.getFileDescriptor());
-                try {
-                    while (in.readNextHeader()) {
-                        String key = in.getKey();
-                        if (key != null && key.charAt(0) >= 0xff00) {
-                            mReporter.onAgentIllegalKey(mCurrentPackage, key);
-                            failAgent(mAgentBinder, "Illegal backup key: " + key);
-                            errorCleanup();
-                            return BackupState.RUNNING_QUEUE;
-                        }
-                        in.skipEntityData();
-                    }
-                } finally {
-                    readFd.close();
-                }
+            if (!validateBackupData(applicationInfo, mBackupDataFile)) {
+                errorCleanup();
+                return true;
             }
-
             writingWidgetData = true;
-            writeWidgetPayloadIfAppropriate(fd, packageName);
+            writeWidgetPayloadIfAppropriate(mBackupData.getFileDescriptor(), packageName);
         } catch (IOException e) {
             if (writingWidgetData) {
                 mReporter.onWriteWidgetDataError(packageName, e);
             } else {
                 mReporter.onReadAgentDataError(packageName, e);
             }
-            try {
-                Os.ftruncate(fd, filePos);
-            } catch (ErrnoException ee) {
-                mReporter.onTruncateDataError();
-            }
+            revertTask();
+            return false;
         }
 
         clearAgentState();
+        boolean nonIncremental = mSavedStateFile.length() == 0;
+        long size = mBackupDataFile.length();
+        if (size > 0) {
+            try (ParcelFileDescriptor backupData =
+                         ParcelFileDescriptor.open(mBackupDataFile, MODE_READ_ONLY)) {
+                IBackupTransport transport =
+                        mTransportClient.connectOrThrow("KVBT.sendDataToTransport()");
+                mReporter.onSendDataToTransport(packageName);
+                int flags = getPerformBackupFlags(mUserInitiated, nonIncremental);
 
-        ParcelFileDescriptor backupData = null;
-        mStatus = BackupTransport.TRANSPORT_OK;
-        long size = 0;
-        try {
-            IBackupTransport transport =
-                    mTransportClient.connectOrThrow("KVBT.sendDataToTransport()");
-            size = mBackupDataFile.length();
-            if (size > 0) {
-                boolean isNonIncremental = mSavedStateFile.length() == 0;
-
-                if (mStatus == BackupTransport.TRANSPORT_OK) {
-                    mReporter.onSendDataToTransport(packageName);
-                    backupData = ParcelFileDescriptor.open(mBackupDataFile, MODE_READ_ONLY);
-                    int userInitiatedFlag =
-                            mUserInitiated ? BackupTransport.FLAG_USER_INITIATED : 0;
-                    int incrementalFlag =
-                            isNonIncremental
-                                    ? BackupTransport.FLAG_NON_INCREMENTAL
-                                    : BackupTransport.FLAG_INCREMENTAL;
-                    int flags = userInitiatedFlag | incrementalFlag;
-
-                    mStatus = transport.performBackup(mCurrentPackage, backupData, flags);
-                }
-
-                if (isNonIncremental
-                        && mStatus == BackupTransport.TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED) {
-                    mReporter.onNonIncrementalAndNonIncrementalRequired();
-                    mStatus = BackupTransport.TRANSPORT_ERROR;
-                }
-
+                mStatus = transport.performBackup(mCurrentPackage, backupData, flags);
                 if (mStatus == BackupTransport.TRANSPORT_OK) {
                     mStatus = transport.finishBackup();
                 }
-            } else {
-                mReporter.onEmptyData(mCurrentPackage);
+            } catch (Exception e) {
+                mReporter.onPackageBackupError(packageName, e);
+                mStatus = BackupTransport.TRANSPORT_ERROR;
             }
+        } else {
+            mReporter.onEmptyData(mCurrentPackage);
+            mStatus = BackupTransport.TRANSPORT_OK;
+        }
 
-            if (mStatus == BackupTransport.TRANSPORT_OK) {
+        if (nonIncremental
+                && mStatus == BackupTransport.TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED) {
+            mReporter.onNonIncrementalAndNonIncrementalRequired();
+            mStatus = BackupTransport.TRANSPORT_ERROR;
+        }
+
+        updateFiles(mStatus);
+        return handleTransportStatus(mStatus, packageName, size);
+    }
+
+    private void updateFiles(int status) {
+        switch (status) {
+            case BackupTransport.TRANSPORT_OK:
                 mBackupDataFile.delete();
                 mNewStateFile.renameTo(mSavedStateFile);
-                mReporter.onPackageBackupComplete(packageName, size);
-            } else if (mStatus == BackupTransport.TRANSPORT_PACKAGE_REJECTED) {
-                mBackupDataFile.delete();
-                mNewStateFile.delete();
-                mReporter.onPackageBackupRejected(packageName);
-            } else if (mStatus == BackupTransport.TRANSPORT_QUOTA_EXCEEDED) {
-                // TODO: Should reset files like above?
-                mReporter.onPackageBackupQuotaExceeded(packageName);
-            } else if (mStatus == BackupTransport.TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED) {
-                mReporter.onPackageBackupNonIncrementalRequired(mCurrentPackage);
-                mBackupDataFile.delete();
+                break;
+            case BackupTransport.TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED:
                 mSavedStateFile.delete();
+                mBackupDataFile.delete();
                 mNewStateFile.delete();
+                break;
+            default:
+                // Includes:
+                // * BackupTransport.TRANSPORT_PACKAGE_REJECTED
+                // * BackupTransport.TRANSPORT_QUOTA_EXCEEDED
+                // * BackupTransport.TRANSPORT_ERROR
+                mBackupDataFile.delete();
+                mNewStateFile.delete();
+                break;
 
-                // Immediately retry the package by adding it back to the front of the queue.
-                // We cannot add @pm@ to the queue because we back it up separately at the start.
-                // Below we request PM backup if that is the case.
-                if (!PM_PACKAGE.equals(packageName)) {
-                    mQueue.add(0, packageName);
-                }
-            } else {
-                mReporter.onPackageBackupTransportFailure(packageName);
-            }
-        } catch (Exception e) {
-            mReporter.onPackageBackupError(packageName, e);
-            mStatus = BackupTransport.TRANSPORT_ERROR;
-        } finally {
-            tryCloseFileDescriptor(backupData, "backup data");
         }
+    }
 
-        final BackupState nextState;
-        if (mStatus == BackupTransport.TRANSPORT_OK
-                || mStatus == BackupTransport.TRANSPORT_PACKAGE_REJECTED) {
-            nextState = BackupState.RUNNING_QUEUE;
-
-        } else if (mStatus == BackupTransport.TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED) {
-            // We want to immediately retry the current package.
-            if (PM_PACKAGE.equals(packageName)) {
-                nextState = BackupState.BACKUP_PM;
-            } else {
-                // This is an ordinary package so we will have added it back into the queue
-                // above. Thus, we proceed processing the queue.
-                nextState = BackupState.RUNNING_QUEUE;
-            }
-
-        } else if (mStatus == BackupTransport.TRANSPORT_QUOTA_EXCEEDED) {
-            if (mAgentBinder != null) {
-                try {
-                    IBackupTransport transport =
-                            mTransportClient.connectOrThrow("KVBT.sendDataToTransport()");
-                    long quota = transport.getBackupQuota(mCurrentPackage.packageName, false);
-                    mAgentBinder.doQuotaExceeded(size, quota);
-                } catch (Exception e) {
-                    mReporter.onAgentDoQuotaExceededError(e);
-                }
-            }
-            nextState = BackupState.RUNNING_QUEUE;
-        } else {
-            // Any other error here indicates a transport-level failure.  That means
-            // we need to halt everything and reschedule everything for next time.
-            revertBackup();
-            nextState = BackupState.FINAL;
+    /** Returns whether to consume next queue package. */
+    private boolean handleTransportStatus(int status, String packageName, long size) {
+        if (status == BackupTransport.TRANSPORT_OK) {
+            mReporter.onPackageBackupComplete(packageName, size);
+            return true;
         }
+        if (status == BackupTransport.TRANSPORT_PACKAGE_REJECTED) {
+            mReporter.onPackageBackupRejected(packageName);
+            return true;
+        }
+        if (status == BackupTransport.TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED) {
+            mReporter.onPackageBackupNonIncrementalRequired(mCurrentPackage);
+            // Immediately retry the current package.
+            mQueue.add(0, packageName);
+            return true;
+        }
+        if (status == BackupTransport.TRANSPORT_QUOTA_EXCEEDED) {
+            mReporter.onPackageBackupQuotaExceeded(packageName);
+            agentDoQuotaExceeded(mAgentBinder, packageName, size);
+            return true;
+        }
+        // Any other error here indicates a transport-level failure.
+        mReporter.onPackageBackupTransportFailure(packageName);
+        revertTask();
+        return false;
+    }
 
-        return nextState;
+    private void agentDoQuotaExceeded(@Nullable IBackupAgent agent, String packageName, long size) {
+        if (agent != null) {
+            try {
+                IBackupTransport transport =
+                        mTransportClient.connectOrThrow("KVBT.agentDoQuotaExceeded()");
+                long quota = transport.getBackupQuota(packageName, false);
+                remoteCall(
+                        callback -> agent.doQuotaExceeded(size, quota, callback),
+                        mAgentTimeoutParameters.getQuotaExceededTimeoutMillis(),
+                        "doQuotaExceeded()");
+            } catch (Exception e) {
+                mReporter.onAgentDoQuotaExceededError(e);
+            }
+        }
+    }
+
+    /**
+     * For system apps and pseudo-apps always return {@code true}. For regular apps returns whether
+     * {@code backupDataFile} doesn't have any protected keys.
+     *
+     * <p>If the app has attempted to write any protected keys we also crash them.
+     */
+    private boolean validateBackupData(
+            @Nullable ApplicationInfo applicationInfo, File backupDataFile) throws IOException {
+        if (applicationInfo == null || (applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+            // System apps and pseudo-apps can write what they want.
+            return true;
+        }
+        try (ParcelFileDescriptor backupData =
+                     ParcelFileDescriptor.open(backupDataFile, MODE_READ_ONLY)) {
+            BackupDataInput backupDataInput = new BackupDataInput(backupData.getFileDescriptor());
+            while (backupDataInput.readNextHeader()) {
+                String key = backupDataInput.getKey();
+                if (key != null && key.charAt(0) >= 0xff00) {
+                    mReporter.onAgentIllegalKey(mCurrentPackage, key);
+                    // Crash them if they wrote any protected keys.
+                    agentFail(mAgentBinder, "Illegal backup key: " + key);
+                    return false;
+                }
+                backupDataInput.skipEntityData();
+            }
+        }
+        return true;
+    }
+
+    private int getPerformBackupFlags(boolean userInitiated, boolean nonIncremental) {
+        int userInitiatedFlag = userInitiated ? BackupTransport.FLAG_USER_INITIATED : 0;
+        int incrementalFlag =
+                nonIncremental
+                        ? BackupTransport.FLAG_NON_INCREMENTAL
+                        : BackupTransport.FLAG_INCREMENTAL;
+        return userInitiatedFlag | incrementalFlag;
     }
 
     /**
@@ -1013,22 +1005,12 @@
         mCancelAcknowledged.block();
     }
 
-    private void handleAgentTimeout() {
-        mReporter.onAgentTimedOut(mCurrentPackage);
-        errorCleanup();
-    }
-
-    private void handleAgentCancelled() {
-        mReporter.onAgentCancelled(mCurrentPackage);
-        errorCleanup();
-    }
-
-    private void revertBackup() {
-        mReporter.onRevertBackup();
+    private void revertTask() {
+        mReporter.onRevertTask();
         long delay;
         try {
             IBackupTransport transport =
-                    mTransportClient.connectOrThrow("KVBT.revertBackup()");
+                    mTransportClient.connectOrThrow("KVBT.revertTask()");
             delay = transport.requestBackupTime();
         } catch (Exception e) {
             mReporter.onTransportRequestBackupTimeError(e);
@@ -1075,20 +1057,13 @@
         }
     }
 
-    private RemoteResult remoteCall(RemoteCallable<IBackupCallback> remoteCallable, long timeoutMs)
+    private RemoteResult remoteCall(
+            RemoteCallable<IBackupCallback> remoteCallable, long timeoutMs, String logIdentifier)
             throws RemoteException {
         mPendingCall = new RemoteCall(mCancelled, remoteCallable, timeoutMs);
         RemoteResult result = mPendingCall.call();
-        mReporter.onRemoteCallReturned(result);
+        mReporter.onRemoteCallReturned(result, logIdentifier);
         mPendingCall = null;
         return result;
     }
-
-    private enum BackupState {
-        INITIAL,
-        BACKUP_PM,
-        RUNNING_QUEUE,
-        CANCELLED,
-        FINAL
-    }
 }
diff --git a/services/backup/java/com/android/server/backup/remote/FutureBackupCallback.java b/services/backup/java/com/android/server/backup/remote/FutureBackupCallback.java
index 1445cc3..1ea4249 100644
--- a/services/backup/java/com/android/server/backup/remote/FutureBackupCallback.java
+++ b/services/backup/java/com/android/server/backup/remote/FutureBackupCallback.java
@@ -23,7 +23,7 @@
 
 /**
  * An implementation of {@link IBackupCallback} that completes the {@link CompletableFuture}
- * provided in the constructor with a successful {@link RemoteResult}.
+ * provided in the constructor with a present {@link RemoteResult}.
  */
 public class FutureBackupCallback extends IBackupCallback.Stub {
     private final CompletableFuture<RemoteResult> mFuture;
@@ -34,6 +34,6 @@
 
     @Override
     public void operationComplete(long result) throws RemoteException {
-        mFuture.complete(RemoteResult.successful(result));
+        mFuture.complete(RemoteResult.of(result));
     }
 }
diff --git a/services/backup/java/com/android/server/backup/remote/RemoteCall.java b/services/backup/java/com/android/server/backup/remote/RemoteCall.java
index ac84811..3af9e1d 100644
--- a/services/backup/java/com/android/server/backup/remote/RemoteCall.java
+++ b/services/backup/java/com/android/server/backup/remote/RemoteCall.java
@@ -44,6 +44,21 @@
  */
 // TODO: Kick-off callable in dedicated thread (because of local calls, which are synchronous)
 public class RemoteCall {
+    /**
+     * Creates a {@link RemoteCall} object with {@code callable} and {@code timeoutMs} and calls
+     * {@link #call()} on it immediately after.
+     *
+     * <p>Note that you won't be able to cancel the call, to do that construct an object regularly
+     * first, then use {@link #call()}.
+     *
+     * @see #RemoteCall(RemoteCallable, long)
+     * @see #call()
+     */
+    public static RemoteResult execute(RemoteCallable<IBackupCallback> callable, long timeoutMs)
+            throws RemoteException {
+        return new RemoteCall(callable, timeoutMs).call();
+    }
+
     private final RemoteCallable<IBackupCallback> mCallable;
     private final CompletableFuture<RemoteResult> mFuture;
     private final long mTimeoutMs;
@@ -83,7 +98,7 @@
      *
      * <ul>
      *   <li>The callback passed to {@link RemoteCallable} is called with the result. We return a
-     *       successful {@link RemoteResult} with the result.
+     *       present {@link RemoteResult} with the result.
      *   <li>Time-out happens. We return {@link RemoteResult#FAILED_TIMED_OUT}.
      *   <li>Someone calls {@link #cancel()} on this object. We return {@link
      *       RemoteResult#FAILED_CANCELLED}.
diff --git a/services/backup/java/com/android/server/backup/remote/RemoteResult.java b/services/backup/java/com/android/server/backup/remote/RemoteResult.java
index 7f4f469..63c79db 100644
--- a/services/backup/java/com/android/server/backup/remote/RemoteResult.java
+++ b/services/backup/java/com/android/server/backup/remote/RemoteResult.java
@@ -29,7 +29,7 @@
  * #FAILED_CANCELLED}, {@link #FAILED_THREAD_INTERRUPTED} or a successful result, in which case
  * {@link #get()} returns its value.
  *
- * <p>Use {@link #succeeded()} to check for successful result, or direct identity comparison to
+ * <p>Use {@link #isPresent()} to check for successful result, or direct identity comparison to
  * check for specific failures, like {@code result == RemoteResult.FAILED_CANCELLED}.
  */
 public class RemoteResult {
@@ -38,7 +38,7 @@
     public static final RemoteResult FAILED_THREAD_INTERRUPTED =
             new RemoteResult(Type.FAILED_THREAD_INTERRUPTED, 0);
 
-    public static RemoteResult successful(long value) {
+    public static RemoteResult of(long value) {
         return new RemoteResult(Type.SUCCESS, value);
     }
 
@@ -50,7 +50,7 @@
         mValue = value;
     }
 
-    public boolean succeeded() {
+    public boolean isPresent() {
         return mType == Type.SUCCESS;
     }
 
@@ -60,7 +60,7 @@
      * @throws IllegalStateException in case this is not a successful result.
      */
     public long get() {
-        Preconditions.checkState(succeeded(), "Can't obtain value of failed result");
+        Preconditions.checkState(isPresent(), "Can't obtain value of failed result");
         return mValue;
     }
 
@@ -79,8 +79,9 @@
                 return "FAILED_CANCELLED";
             case Type.FAILED_THREAD_INTERRUPTED:
                 return "FAILED_THREAD_INTERRUPTED";
+            default:
+                throw new AssertionError("Unknown type");
         }
-        throw new AssertionError("Unknown type");
     }
 
     @Override
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index 02a62ff..665c6b7 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -19,37 +19,9 @@
 import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
 import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
 import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;
+
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
-import com.android.internal.annotations.GuardedBy;
-import com.android.internal.content.PackageMonitor;
-import com.android.internal.inputmethod.IInputContentUriToken;
-import com.android.internal.inputmethod.InputMethodSubtypeSwitchingController;
-import com.android.internal.inputmethod.InputMethodSubtypeSwitchingController.ImeSubtypeListItem;
-import com.android.internal.inputmethod.InputMethodUtils;
-import com.android.internal.inputmethod.InputMethodUtils.InputMethodSettings;
-import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
-import com.android.internal.notification.SystemNotificationChannels;
-import com.android.internal.os.HandlerCaller;
-import com.android.internal.os.SomeArgs;
-import com.android.internal.os.TransferPipe;
-import com.android.internal.util.DumpUtils;
-import com.android.internal.util.FastXmlSerializer;
-import com.android.internal.util.IndentingPrintWriter;
-import com.android.internal.view.IInputContext;
-import com.android.internal.view.IInputMethod;
-import com.android.internal.view.IInputMethodClient;
-import com.android.internal.view.IInputMethodManager;
-import com.android.internal.view.IInputMethodSession;
-import com.android.internal.view.IInputSessionCallback;
-import com.android.internal.view.InputBindResult;
-import com.android.internal.view.InputMethodClient;
-import com.android.server.statusbar.StatusBarManagerService;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlSerializer;
-
 import android.Manifest;
 import android.accessibilityservice.AccessibilityService;
 import android.annotation.AnyThread;
@@ -60,7 +32,6 @@
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
-import android.annotation.TestApi;
 import android.annotation.UserIdInt;
 import android.app.ActivityManager;
 import android.app.ActivityManagerInternal;
@@ -102,8 +73,8 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.IInterface;
-import android.os.Message;
 import android.os.LocaleList;
+import android.os.Message;
 import android.os.Parcel;
 import android.os.Process;
 import android.os.RemoteException;
@@ -144,7 +115,6 @@
 import android.view.inputmethod.InputMethod;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
-import android.view.inputmethod.InputMethodManagerInternal;
 import android.view.inputmethod.InputMethodSubtype;
 import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder;
 import android.widget.ArrayAdapter;
@@ -154,8 +124,37 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.content.PackageMonitor;
+import com.android.internal.inputmethod.IInputContentUriToken;
+import com.android.internal.inputmethod.InputMethodSubtypeSwitchingController;
+import com.android.internal.inputmethod.InputMethodSubtypeSwitchingController.ImeSubtypeListItem;
+import com.android.internal.inputmethod.InputMethodUtils;
+import com.android.internal.inputmethod.InputMethodUtils.InputMethodSettings;
+import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
+import com.android.internal.notification.SystemNotificationChannels;
+import com.android.internal.os.HandlerCaller;
+import com.android.internal.os.SomeArgs;
+import com.android.internal.os.TransferPipe;
+import com.android.internal.util.DumpUtils;
+import com.android.internal.util.FastXmlSerializer;
+import com.android.internal.util.IndentingPrintWriter;
+import com.android.internal.view.IInputContext;
+import com.android.internal.view.IInputMethod;
+import com.android.internal.view.IInputMethodClient;
+import com.android.internal.view.IInputMethodManager;
+import com.android.internal.view.IInputMethodSession;
+import com.android.internal.view.IInputSessionCallback;
+import com.android.internal.view.InputBindResult;
+import com.android.internal.view.InputMethodClient;
+import com.android.server.inputmethod.InputMethodManagerInternal;
+import com.android.server.statusbar.StatusBarManagerService;
 import com.android.server.wm.WindowManagerInternal;
 
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlSerializer;
+
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
@@ -205,6 +204,8 @@
     static final int MSG_START_INPUT = 2000;
     static final int MSG_START_VR_INPUT = 2010;
 
+    static final int MSG_ADD_CLIENT = 2980;
+    static final int MSG_REMOVE_CLIENT = 2990;
     static final int MSG_UNBIND_CLIENT = 3000;
     static final int MSG_BIND_CLIENT = 3010;
     static final int MSG_SET_ACTIVE = 3020;
@@ -1713,22 +1714,13 @@
         }
     }
 
-    @Override
-    public void addClient(IInputMethodClient client, IInputContext inputContext, int uid, int pid) {
-        if (Binder.getCallingUid() != Process.SYSTEM_UID) {
-            throw new SecurityException("Only system process can call this method.");
-        }
+    void addClient(ClientState clientState) {
         synchronized (mMethodMap) {
-            mClients.put(client.asBinder(), new ClientState(client,
-                    inputContext, uid, pid));
+            mClients.put(clientState.client.asBinder(), clientState);
         }
     }
 
-    @Override
-    public void removeClient(IInputMethodClient client) {
-        if (Binder.getCallingUid() != Process.SYSTEM_UID) {
-            throw new SecurityException("Only system process can call this method.");
-        }
+    void removeClient(IInputMethodClient client) {
         synchronized (mMethodMap) {
             ClientState cs = mClients.remove(client.asBinder());
             if (cs != null) {
@@ -2531,19 +2523,14 @@
             synchronized (mMethodMap) {
                 if (mCurClient == null || client == null
                         || mCurClient.client.asBinder() != client.asBinder()) {
-                    try {
-                        // We need to check if this is the current client with
-                        // focus in the window manager, to allow this call to
-                        // be made before input is started in it.
-                        if (!mIWindowManager.inputMethodClientHasFocus(client)) {
-                            Slog.w(TAG, "Ignoring showSoftInput of uid " + uid + ": " + client);
-                            return false;
-                        }
-                    } catch (RemoteException e) {
+                    // We need to check if this is the current client with
+                    // focus in the window manager, to allow this call to
+                    // be made before input is started in it.
+                    if (!mWindowManagerInternal.inputMethodClientHasFocus(client)) {
+                        Slog.w(TAG, "Ignoring showSoftInput of uid " + uid + ": " + client);
                         return false;
                     }
                 }
-
                 if (DEBUG) Slog.v(TAG, "Client requesting input be shown");
                 return showCurrentInputLocked(flags, resultReceiver);
             }
@@ -2616,16 +2603,13 @@
             synchronized (mMethodMap) {
                 if (mCurClient == null || client == null
                         || mCurClient.client.asBinder() != client.asBinder()) {
-                    try {
-                        // We need to check if this is the current client with
-                        // focus in the window manager, to allow this call to
-                        // be made before input is started in it.
-                        if (!mIWindowManager.inputMethodClientHasFocus(client)) {
-                            if (DEBUG) Slog.w(TAG, "Ignoring hideSoftInput of uid "
-                                    + uid + ": " + client);
-                            return false;
+                    // We need to check if this is the current client with
+                    // focus in the window manager, to allow this call to
+                    // be made before input is started in it.
+                    if (!mWindowManagerInternal.inputMethodClientHasFocus(client)) {
+                        if (DEBUG) {
+                            Slog.w(TAG, "Ignoring hideSoftInput of uid " + uid + ": " + client);
                         }
-                    } catch (RemoteException e) {
                         return false;
                     }
                 }
@@ -2740,20 +2724,17 @@
                             + client.asBinder());
                 }
 
-                try {
-                    if (!mIWindowManager.inputMethodClientHasFocus(cs.client)) {
-                        // Check with the window manager to make sure this client actually
-                        // has a window with focus.  If not, reject.  This is thread safe
-                        // because if the focus changes some time before or after, the
-                        // next client receiving focus that has any interest in input will
-                        // be calling through here after that change happens.
-                        if (DEBUG) {
-                            Slog.w(TAG, "Focus gain on non-focused client " + cs.client
-                                    + " (uid=" + cs.uid + " pid=" + cs.pid + ")");
-                        }
-                        return InputBindResult.NOT_IME_TARGET_WINDOW;
+                if (!mWindowManagerInternal.inputMethodClientHasFocus(cs.client)) {
+                    // Check with the window manager to make sure this client actually
+                    // has a window with focus.  If not, reject.  This is thread safe
+                    // because if the focus changes some time before or after, the
+                    // next client receiving focus that has any interest in input will
+                    // be calling through here after that change happens.
+                    if (DEBUG) {
+                        Slog.w(TAG, "Focus gain on non-focused client " + cs.client
+                                + " (uid=" + cs.uid + " pid=" + cs.pid + ")");
                     }
-                } catch (RemoteException e) {
+                    return InputBindResult.NOT_IME_TARGET_WINDOW;
                 }
 
                 if (!calledFromValidUser) {
@@ -3415,6 +3396,15 @@
             }
 
             // ---------------------------------------------------------
+            case MSG_ADD_CLIENT:
+                addClient((ClientState) msg.obj);
+                return true;
+
+            case MSG_REMOVE_CLIENT:
+                removeClient((IInputMethodClient) msg.obj);
+                return true;
+
+            // ---------------------------------------------------------
 
             case MSG_UNBIND_CLIENT:
                 try {
@@ -4405,7 +4395,7 @@
         }
     }
 
-    private static final class LocalServiceImpl implements InputMethodManagerInternal {
+    private static final class LocalServiceImpl extends InputMethodManagerInternal {
         @NonNull
         private final Handler mHandler;
 
@@ -4414,6 +4404,18 @@
         }
 
         @Override
+        public void addClient(IInputMethodClient client, IInputContext inputContext, int uid,
+                int pid) {
+            mHandler.sendMessage(mHandler.obtainMessage(MSG_ADD_CLIENT,
+                    new ClientState(client, inputContext, uid, pid)));
+        }
+
+        @Override
+        public void removeClient(IInputMethodClient client) {
+            mHandler.sendMessage(mHandler.obtainMessage(MSG_REMOVE_CLIENT, client));
+        }
+
+        @Override
         public void setInteractive(boolean interactive) {
             // Do everything in handler so as not to block the caller.
             mHandler.sendMessage(mHandler.obtainMessage(MSG_SET_INTERACTIVE,
diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java
index 744ed25..01e8152 100644
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -27,7 +27,6 @@
 import android.annotation.NonNull;
 import android.app.AppOpsManager;
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.net.IIpSecService;
 import android.net.INetd;
 import android.net.IpSecAlgorithm;
@@ -44,7 +43,6 @@
 import android.net.TrafficStats;
 import android.net.util.NetdService;
 import android.os.Binder;
-import android.os.DeadSystemException;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
@@ -89,9 +87,8 @@
     private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
 
     private static final String NETD_SERVICE_NAME = "netd";
-    private static final int[] DIRECTIONS =
-            new int[] {IpSecManager.DIRECTION_OUT, IpSecManager.DIRECTION_IN};
-    private static final String[] WILDCARD_ADDRESSES = new String[]{"0.0.0.0", "::"};
+    private static final int[] ADDRESS_FAMILIES =
+            new int[] {OsConstants.AF_INET, OsConstants.AF_INET6};
 
     private static final int NETD_FETCH_TIMEOUT_MS = 5000; // ms
     private static final int MAX_PORT_BIND_ATTEMPTS = 10;
@@ -819,16 +816,22 @@
             //       Teardown VTI
             //       Delete global policies
             try {
-                mSrvConfig.getNetdInstance().removeVirtualTunnelInterface(mInterfaceName);
+                final INetd netd = mSrvConfig.getNetdInstance();
+                netd.removeVirtualTunnelInterface(mInterfaceName);
 
-                for(String wildcardAddr : WILDCARD_ADDRESSES) {
-                    for (int direction : DIRECTIONS) {
-                        int mark = (direction == IpSecManager.DIRECTION_IN) ? mIkey : mOkey;
-                        mSrvConfig
-                                .getNetdInstance()
-                                .ipSecDeleteSecurityPolicy(
-                                        0, direction, wildcardAddr, wildcardAddr, mark, 0xffffffff);
-                    }
+                for (int selAddrFamily : ADDRESS_FAMILIES) {
+                    netd.ipSecDeleteSecurityPolicy(
+                            0,
+                            selAddrFamily,
+                            IpSecManager.DIRECTION_OUT,
+                            mOkey,
+                            0xffffffff);
+                    netd.ipSecDeleteSecurityPolicy(
+                            0,
+                            selAddrFamily,
+                            IpSecManager.DIRECTION_IN,
+                            mIkey,
+                            0xffffffff);
                 }
             } catch (ServiceSpecificException | RemoteException e) {
                 Log.e(
@@ -1276,25 +1279,29 @@
             //       Create VTI
             //       Add inbound/outbound global policies
             //              (use reqid = 0)
-            mSrvConfig
-                    .getNetdInstance()
-                    .addVirtualTunnelInterface(intfName, localAddr, remoteAddr, ikey, okey);
+            final INetd netd = mSrvConfig.getNetdInstance();
+            netd.addVirtualTunnelInterface(intfName, localAddr, remoteAddr, ikey, okey);
 
-            for(String wildcardAddr : WILDCARD_ADDRESSES) {
-                for (int direction : DIRECTIONS) {
-                    int mark = (direction == IpSecManager.DIRECTION_OUT) ? okey : ikey;
-
-                    mSrvConfig
-                            .getNetdInstance()
-                            .ipSecAddSecurityPolicy(
-                                0, // Use 0 for reqId
-                                direction,
-                                wildcardAddr,
-                                wildcardAddr,
-                                0,
-                                mark,
-                                0xffffffff);
-                }
+            for (int selAddrFamily : ADDRESS_FAMILIES) {
+                // Always send down correct local/remote addresses for template.
+                netd.ipSecAddSecurityPolicy(
+                        0, // Use 0 for reqId
+                        selAddrFamily,
+                        IpSecManager.DIRECTION_OUT,
+                        localAddr,
+                        remoteAddr,
+                        0,
+                        okey,
+                        0xffffffff);
+                netd.ipSecAddSecurityPolicy(
+                        0, // Use 0 for reqId
+                        selAddrFamily,
+                        IpSecManager.DIRECTION_IN,
+                        remoteAddr,
+                        localAddr,
+                        0,
+                        ikey,
+                        0xffffffff);
             }
 
             userRecord.mTunnelInterfaceRecords.put(
@@ -1693,9 +1700,9 @@
         SpiRecord spiRecord = userRecord.mSpiRecords.getResourceOrThrow(c.getSpiResourceId());
 
         int mark =
-                (direction == IpSecManager.DIRECTION_IN)
-                        ? tunnelInterfaceInfo.getIkey()
-                        : tunnelInterfaceInfo.getOkey();
+                (direction == IpSecManager.DIRECTION_OUT)
+                        ? tunnelInterfaceInfo.getOkey()
+                        : tunnelInterfaceInfo.getIkey();
 
         try {
             c.setMarkValue(mark);
@@ -1706,14 +1713,15 @@
                 c.setNetwork(tunnelInterfaceInfo.getUnderlyingNetwork());
 
                 // If outbound, also add SPI to the policy.
-                for(String wildcardAddr : WILDCARD_ADDRESSES) {
+                for (int selAddrFamily : ADDRESS_FAMILIES) {
                     mSrvConfig
                             .getNetdInstance()
                             .ipSecUpdateSecurityPolicy(
                                     0, // Use 0 for reqId
+                                    selAddrFamily,
                                     direction,
-                                    wildcardAddr,
-                                    wildcardAddr,
+                                    tunnelInterfaceInfo.getLocalAddress(),
+                                    tunnelInterfaceInfo.getRemoteAddress(),
                                     transformInfo.getSpiRecord().getSpi(),
                                     mark,
                                     0xffffffff);
diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS
index 4fa0c07..fe9f1b5 100644
--- a/services/core/java/com/android/server/OWNERS
+++ b/services/core/java/com/android/server/OWNERS
@@ -1,25 +1,5 @@
 # Connectivity / Networking
-per-file ConnectivityService.java=codewiz@google.com
-per-file ConnectivityService.java=ek@google.com
-per-file ConnectivityService.java=jchalard@google.com
-per-file ConnectivityService.java=lorenzo@google.com
-per-file ConnectivityService.java=reminv@google.com
-per-file ConnectivityService.java=satk@google.com
-per-file NetworkManagementService.java=codewiz@google.com
-per-file NetworkManagementService.java=ek@google.com
-per-file NetworkManagementService.java=jchalard@google.com
-per-file NetworkManagementService.java=lorenzo@google.com
-per-file NetworkManagementService.java=reminv@google.com
-per-file NetworkManagementService.java=satk@google.com
-per-file NsdService.java=codewiz@google.com
-per-file NsdService.java=ek@google.com
-per-file NsdService.java=jchalard@google.com
-per-file NsdService.java=lorenzo@google.com
-per-file NsdService.java=reminv@google.com
-per-file NsdService.java=satk@google.com
+per-file ConnectivityService.java,NetworkManagementService.java,NsdService.java = codewiz@google.com, ek@google.com, jchalard@google.com, lorenzo@google.com, reminv@google.com, satk@google.com
 
-# Vibrator
-per-file VibratorService.java=michaelwr@google.com
-
-# Threads
-per-file DisplayThread.java=michaelwr@google.com
+# Vibrator / Threads
+per-file VibratorService.java, DisplayThread.java = michaelwr@google.com
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 1746b85..d505a77 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -44,11 +44,9 @@
 import android.app.admin.SecurityLog;
 import android.app.usage.StorageStatsManager;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.ServiceConnection;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageMoveObserver;
 import android.content.pm.PackageManager;
@@ -115,7 +113,6 @@
 
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.app.IMediaContainerService;
 import com.android.internal.os.AppFuseMount;
 import com.android.internal.os.BackgroundThread;
 import com.android.internal.os.FuseUnavailableMountException;
@@ -544,37 +541,7 @@
 
     // OBB action handler messages
     private static final int OBB_RUN_ACTION = 1;
-    private static final int OBB_MCS_BOUND = 2;
-    private static final int OBB_MCS_UNBIND = 3;
-    private static final int OBB_MCS_RECONNECT = 4;
-    private static final int OBB_FLUSH_MOUNT_STATE = 5;
-
-    /*
-     * Default Container Service information
-     */
-    static final ComponentName DEFAULT_CONTAINER_COMPONENT = new ComponentName(
-            "com.android.defcontainer", "com.android.defcontainer.DefaultContainerService");
-
-    final private DefaultContainerConnection mDefContainerConn = new DefaultContainerConnection();
-
-    class DefaultContainerConnection implements ServiceConnection {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            if (DEBUG_OBB)
-                Slog.i(TAG, "onServiceConnected");
-            IMediaContainerService imcs = IMediaContainerService.Stub.asInterface(service);
-            mObbActionHandler.sendMessage(mObbActionHandler.obtainMessage(OBB_MCS_BOUND, imcs));
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            if (DEBUG_OBB)
-                Slog.i(TAG, "onServiceDisconnected");
-        }
-    }
-
-    // Used in the ObbActionHandler
-    private IMediaContainerService mContainerService = null;
+    private static final int OBB_FLUSH_MOUNT_STATE = 2;
 
     // Last fstrim operation tracking
     private static final String LAST_FSTRIM_FILE = "last-fstrim";
@@ -2305,16 +2272,17 @@
     }
 
     @Override
-    public void mountObb(
-            String rawPath, String canonicalPath, String key, IObbActionListener token, int nonce) {
+    public void mountObb(String rawPath, String canonicalPath, String key,
+            IObbActionListener token, int nonce, ObbInfo obbInfo) {
         Preconditions.checkNotNull(rawPath, "rawPath cannot be null");
         Preconditions.checkNotNull(canonicalPath, "canonicalPath cannot be null");
         Preconditions.checkNotNull(token, "token cannot be null");
+        Preconditions.checkNotNull(obbInfo, "obbIfno cannot be null");
 
         final int callingUid = Binder.getCallingUid();
         final ObbState obbState = new ObbState(rawPath, canonicalPath,
                 callingUid, token, nonce, null);
-        final ObbAction action = new MountObbAction(obbState, key, callingUid);
+        final ObbAction action = new MountObbAction(obbState, key, callingUid, obbInfo);
         mObbActionHandler.sendMessage(mObbActionHandler.obtainMessage(OBB_RUN_ACTION, action));
 
         if (DEBUG_OBB)
@@ -3217,8 +3185,6 @@
     }
 
     private class ObbActionHandler extends Handler {
-        private boolean mBound = false;
-        private final List<ObbAction> mActions = new LinkedList<ObbAction>();
 
         ObbActionHandler(Looper l) {
             super(l);
@@ -3233,83 +3199,7 @@
                     if (DEBUG_OBB)
                         Slog.i(TAG, "OBB_RUN_ACTION: " + action.toString());
 
-                    // If a bind was already initiated we don't really
-                    // need to do anything. The pending install
-                    // will be processed later on.
-                    if (!mBound) {
-                        // If this is the only one pending we might
-                        // have to bind to the service again.
-                        if (!connectToService()) {
-                            action.notifyObbStateChange(new ObbException(ERROR_INTERNAL,
-                                    "Failed to bind to media container service"));
-                            return;
-                        }
-                    }
-
-                    mActions.add(action);
-                    break;
-                }
-                case OBB_MCS_BOUND: {
-                    if (DEBUG_OBB)
-                        Slog.i(TAG, "OBB_MCS_BOUND");
-                    if (msg.obj != null) {
-                        mContainerService = (IMediaContainerService) msg.obj;
-                    }
-                    if (mContainerService == null) {
-                        // Something seriously wrong. Bail out
-                        for (ObbAction action : mActions) {
-                            // Indicate service bind error
-                            action.notifyObbStateChange(new ObbException(ERROR_INTERNAL,
-                                    "Failed to bind to media container service"));
-                        }
-                        mActions.clear();
-                    } else if (mActions.size() > 0) {
-                        final ObbAction action = mActions.get(0);
-                        if (action != null) {
-                            action.execute(this);
-                        }
-                    } else {
-                        // Should never happen ideally.
-                        Slog.w(TAG, "Empty queue");
-                    }
-                    break;
-                }
-                case OBB_MCS_RECONNECT: {
-                    if (DEBUG_OBB)
-                        Slog.i(TAG, "OBB_MCS_RECONNECT");
-                    if (mActions.size() > 0) {
-                        if (mBound) {
-                            disconnectService();
-                        }
-                        if (!connectToService()) {
-                            for (ObbAction action : mActions) {
-                                // Indicate service bind error
-                                action.notifyObbStateChange(new ObbException(ERROR_INTERNAL,
-                                        "Failed to bind to media container service"));
-                            }
-                            mActions.clear();
-                        }
-                    }
-                    break;
-                }
-                case OBB_MCS_UNBIND: {
-                    if (DEBUG_OBB)
-                        Slog.i(TAG, "OBB_MCS_UNBIND");
-
-                    // Delete pending install
-                    if (mActions.size() > 0) {
-                        mActions.remove(0);
-                    }
-                    if (mActions.size() == 0) {
-                        if (mBound) {
-                            disconnectService();
-                        }
-                    } else {
-                        // There are more pending requests in queue.
-                        // Just post MCS_BOUND message to trigger processing
-                        // of next pending install.
-                        mObbActionHandler.sendEmptyMessage(OBB_MCS_BOUND);
-                    }
+                    action.execute(this);
                     break;
                 }
                 case OBB_FLUSH_MOUNT_STATE: {
@@ -3354,25 +3244,6 @@
                 }
             }
         }
-
-        private boolean connectToService() {
-            if (DEBUG_OBB)
-                Slog.i(TAG, "Trying to bind to DefaultContainerService");
-
-            Intent service = new Intent().setComponent(DEFAULT_CONTAINER_COMPONENT);
-            if (mContext.bindServiceAsUser(service, mDefContainerConn, Context.BIND_AUTO_CREATE,
-                    UserHandle.SYSTEM)) {
-                mBound = true;
-                return true;
-            }
-            return false;
-        }
-
-        private void disconnectService() {
-            mContainerService = null;
-            mBound = false;
-            mContext.unbindService(mDefContainerConn);
-        }
     }
 
     private static class ObbException extends Exception {
@@ -3390,8 +3261,6 @@
     }
 
     abstract class ObbAction {
-        private static final int MAX_RETRIES = 3;
-        private int mRetries;
 
         ObbState mObbState;
 
@@ -3403,40 +3272,14 @@
             try {
                 if (DEBUG_OBB)
                     Slog.i(TAG, "Starting to execute action: " + toString());
-                mRetries++;
-                if (mRetries > MAX_RETRIES) {
-                    mObbActionHandler.sendEmptyMessage(OBB_MCS_UNBIND);
-                    notifyObbStateChange(new ObbException(ERROR_INTERNAL,
-                            "Failed to bind to media container service"));
-                } else {
-                    handleExecute();
-                    if (DEBUG_OBB)
-                        Slog.i(TAG, "Posting install MCS_UNBIND");
-                    mObbActionHandler.sendEmptyMessage(OBB_MCS_UNBIND);
-                }
+                handleExecute();
             } catch (ObbException e) {
                 notifyObbStateChange(e);
-                mObbActionHandler.sendEmptyMessage(OBB_MCS_UNBIND);
             }
         }
 
         abstract void handleExecute() throws ObbException;
 
-        protected ObbInfo getObbInfo() throws ObbException {
-            final ObbInfo obbInfo;
-            try {
-                obbInfo = mContainerService.getObbInfo(mObbState.canonicalPath);
-            } catch (Exception e) {
-                throw new ObbException(ERROR_PERMISSION_DENIED, e);
-            }
-            if (obbInfo != null) {
-                return obbInfo;
-            } else {
-                throw new ObbException(ERROR_INTERNAL,
-                        "Missing OBB info for: " + mObbState.canonicalPath);
-            }
-        }
-
         protected void notifyObbStateChange(ObbException e) {
             Slog.w(TAG, e);
             notifyObbStateChange(e.status);
@@ -3458,22 +3301,22 @@
     class MountObbAction extends ObbAction {
         private final String mKey;
         private final int mCallingUid;
+        private ObbInfo mObbInfo;
 
-        MountObbAction(ObbState obbState, String key, int callingUid) {
+        MountObbAction(ObbState obbState, String key, int callingUid, ObbInfo obbInfo) {
             super(obbState);
             mKey = key;
             mCallingUid = callingUid;
+            mObbInfo = obbInfo;
         }
 
         @Override
         public void handleExecute() throws ObbException {
             warnOnNotMounted();
 
-            final ObbInfo obbInfo = getObbInfo();
-
-            if (!isUidOwnerOfPackageOrSystem(obbInfo.packageName, mCallingUid)) {
+            if (!isUidOwnerOfPackageOrSystem(mObbInfo.packageName, mCallingUid)) {
                 throw new ObbException(ERROR_PERMISSION_DENIED, "Denied attempt to mount OBB "
-                        + obbInfo.filename + " which is owned by " + obbInfo.packageName);
+                        + mObbInfo.filename + " which is owned by " + mObbInfo.packageName);
             }
 
             final boolean isMounted;
@@ -3482,7 +3325,7 @@
             }
             if (isMounted) {
                 throw new ObbException(ERROR_ALREADY_MOUNTED,
-                        "Attempt to mount OBB which is already mounted: " + obbInfo.filename);
+                        "Attempt to mount OBB which is already mounted: " + mObbInfo.filename);
             }
 
             final String hashedKey;
@@ -3494,7 +3337,7 @@
                 try {
                     SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
 
-                    KeySpec ks = new PBEKeySpec(mKey.toCharArray(), obbInfo.salt,
+                    KeySpec ks = new PBEKeySpec(mKey.toCharArray(), mObbInfo.salt,
                             PBKDF2_HASH_ROUNDS, CRYPTO_ALGORITHM_KEY_SIZE);
                     SecretKey key = factory.generateSecret(ks);
                     BigInteger bi = new BigInteger(key.getEncoded());
diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java
index ae3946a..b2be5e6 100644
--- a/services/core/java/com/android/server/VibratorService.java
+++ b/services/core/java/com/android/server/VibratorService.java
@@ -27,47 +27,46 @@
 import android.hardware.input.InputManager;
 import android.hardware.vibrator.V1_0.EffectStrength;
 import android.icu.text.DateFormat;
+import android.media.AudioAttributes;
 import android.media.AudioManager;
-import android.os.PowerManager.ServiceType;
-import android.os.PowerSaveState;
 import android.os.BatteryStats;
+import android.os.Binder;
 import android.os.Handler;
+import android.os.IBinder;
 import android.os.IVibratorService;
 import android.os.PowerManager;
+import android.os.PowerManager.ServiceType;
 import android.os.PowerManagerInternal;
+import android.os.PowerSaveState;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.ResultReceiver;
-import android.os.IBinder;
-import android.os.Binder;
 import android.os.ServiceManager;
 import android.os.ShellCallback;
 import android.os.ShellCommand;
 import android.os.SystemClock;
 import android.os.Trace;
 import android.os.UserHandle;
-import android.os.Vibrator;
 import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.os.WorkSource;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.util.DebugUtils;
 import android.util.Slog;
 import android.util.SparseArray;
+import android.util.StatsLog;
 import android.view.InputDevice;
-import android.media.AudioAttributes;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.internal.app.IAppOpsService;
 import com.android.internal.app.IBatteryStats;
 import com.android.internal.util.DumpUtils;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Date;
+import java.util.LinkedList;
 
 public class VibratorService extends IVibratorService.Stub
         implements InputManager.InputDeviceListener {
@@ -1048,6 +1047,8 @@
     private void noteVibratorOnLocked(int uid, long millis) {
         try {
             mBatteryStatsService.noteVibratorOn(uid, millis);
+            StatsLog.write_non_chained(StatsLog.VIBRATOR_STATE_CHANGED, uid, null,
+                    StatsLog.VIBRATOR_STATE_CHANGED__STATE__ON, millis);
             mCurVibUid = uid;
         } catch (RemoteException e) {
         }
@@ -1057,6 +1058,8 @@
         if (mCurVibUid >= 0) {
             try {
                 mBatteryStatsService.noteVibratorOff(mCurVibUid);
+                StatsLog.write_non_chained(StatsLog.VIBRATOR_STATE_CHANGED, mCurVibUid, null,
+                        StatsLog.VIBRATOR_STATE_CHANGED__STATE__OFF, 0);
             } catch (RemoteException e) { }
             mCurVibUid = -1;
         }
diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index 713da30..6d69fcd 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -17,34 +17,33 @@
 package com.android.server;
 
 import android.app.IActivityController;
-import android.os.Binder;
-import android.os.Build;
-import android.os.RemoteException;
-import android.system.ErrnoException;
-import android.system.Os;
-import android.system.OsConstants;
-import android.system.StructRlimit;
-import com.android.internal.os.ZygoteConnectionConstants;
-import com.android.server.am.ActivityManagerService;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.hidl.manager.V1_0.IServiceManager;
+import android.os.Binder;
+import android.os.Build;
 import android.os.Debug;
 import android.os.Handler;
 import android.os.IPowerManager;
 import android.os.Looper;
 import android.os.Process;
+import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
-import android.os.SystemProperties;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
+import android.system.StructRlimit;
 import android.util.EventLog;
 import android.util.Log;
 import android.util.Slog;
 
+import com.android.internal.os.ZygoteConnectionConstants;
+import com.android.server.am.ActivityManagerService;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -62,6 +61,9 @@
 public class Watchdog extends Thread {
     static final String TAG = "Watchdog";
 
+    /** Debug flag. */
+    public static final boolean DEBUG = true; // STOPSHIP disable it (b/113252928)
+
     // Set this to true to use debug default values.
     static final boolean DB = false;
 
@@ -140,7 +142,7 @@
             mCompleted = true;
         }
 
-        public void addMonitor(Monitor monitor) {
+        void addMonitorLocked(Monitor monitor) {
             mMonitors.add(monitor);
         }
 
@@ -167,7 +169,7 @@
             mHandler.postAtFrontOfQueue(this);
         }
 
-        public boolean isOverdueLocked() {
+        boolean isOverdueLocked() {
             return (!mCompleted) && (SystemClock.uptimeMillis() > mStartTime + mWaitMax);
         }
 
@@ -193,7 +195,7 @@
             return mName;
         }
 
-        public String describeBlockedStateLocked() {
+        String describeBlockedStateLocked() {
             if (mCurrentMonitor == null) {
                 return "Blocked in handler on " + mName + " (" + getThread().getName() + ")";
             } else {
@@ -323,7 +325,7 @@
             if (isAlive()) {
                 throw new RuntimeException("Monitors can't be added once the Watchdog is running");
             }
-            mMonitorChecker.addMonitor(monitor);
+            mMonitorChecker.addMonitorLocked(monitor);
         }
     }
 
@@ -478,11 +480,12 @@
                         continue;
                     } else if (waitState == WAITED_HALF) {
                         if (!waitedHalf) {
+                            if (DEBUG) Slog.d(TAG, "WAITED_HALF");
                             // We've waited half the deadlock-detection interval.  Pull a stack
                             // trace and wait another half.
                             ArrayList<Integer> pids = new ArrayList<Integer>();
                             pids.add(Process.myPid());
-                            ActivityManagerService.dumpStackTraces(true, pids, null, null,
+                            ActivityManagerService.dumpStackTraces(pids, null, null,
                                 getInterestingNativePids());
                             waitedHalf = true;
                         }
@@ -507,14 +510,13 @@
             ArrayList<Integer> pids = new ArrayList<>();
             pids.add(Process.myPid());
             if (mPhonePid > 0) pids.add(mPhonePid);
-            // Pass !waitedHalf so that just in case we somehow wind up here without having
-            // dumped the halfway stacks, we properly re-initialize the trace file.
+
             final File stack = ActivityManagerService.dumpStackTraces(
-                    !waitedHalf, pids, null, null, getInterestingNativePids());
+                    pids, null, null, getInterestingNativePids());
 
             // Give some extra time to make sure the stack traces get written.
             // The system's been hanging for a minute, another second or two won't hurt much.
-            SystemClock.sleep(2000);
+            SystemClock.sleep(5000);
 
             // Trigger the kernel to dump all blocked threads, and backtraces on all CPUs to the kernel log
             doSysRq('w');
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 5bf6892..e5aa3f4 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -1628,7 +1628,7 @@
             // Once the apps have become associated, if one of them is caller is ephemeral
             // the target app should now be able to see the calling app
             mAm.grantEphemeralAccessLocked(callerApp.userId, service,
-                    s.appInfo.uid, UserHandle.getAppId(callerApp.uid));
+                    UserHandle.getAppId(s.appInfo.uid), UserHandle.getAppId(callerApp.uid));
 
             AppBindRecord b = s.retrieveAppBindingLocked(service, callerApp);
             ConnectionRecord c = new ConnectionRecord(b, activity,
@@ -2581,8 +2581,8 @@
                 mAm.mUgmInternal.grantUriPermissionUncheckedFromIntent(si.neededGrants,
                         si.getUriPermissionsLocked());
             }
-            mAm.grantEphemeralAccessLocked(r.userId, si.intent,
-                    r.appInfo.uid, UserHandle.getAppId(si.callingId));
+            mAm.grantEphemeralAccessLocked(r.userId, si.intent, UserHandle.getAppId(r.appInfo.uid),
+                    UserHandle.getAppId(si.callingId));
             bumpServiceExecutingLocked(r, execInFg, "start");
             if (!oomAdjusted) {
                 oomAdjusted = true;
diff --git a/services/core/java/com/android/server/am/ActivityDisplay.java b/services/core/java/com/android/server/am/ActivityDisplay.java
index 73ffd5c..aa5a2e0 100644
--- a/services/core/java/com/android/server/am/ActivityDisplay.java
+++ b/services/core/java/com/android/server/am/ActivityDisplay.java
@@ -31,6 +31,7 @@
 import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.Display.FLAG_PRIVATE;
 import static android.view.Display.REMOVE_MODE_DESTROY_CONTENT;
+
 import static com.android.server.am.ActivityDisplayProto.CONFIGURATION_CONTAINER;
 import static com.android.server.am.ActivityDisplayProto.FOCUSED_STACK_ID;
 import static com.android.server.am.ActivityDisplayProto.ID;
@@ -43,7 +44,6 @@
 import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
 import static com.android.server.am.ActivityStackSupervisor.TAG_STATES;
 
-import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.app.ActivityOptions;
 import android.app.WindowConfiguration;
@@ -103,6 +103,12 @@
 
     private boolean mSleeping;
 
+    /**
+     * The display is removed from the system and we are just waiting for all activities on it to be
+     * finished before removing this object.
+     */
+    private boolean mRemoved;
+
     // Cached reference to some special stacks we tend to get a lot so we don't need to loop
     // through the list to find them.
     private ActivityStack mHomeStack = null;
@@ -132,6 +138,10 @@
         return new DisplayWindowController(mDisplay, this);
     }
 
+    DisplayWindowController getWindowContainerController() {
+        return mWindowContainerController;
+    }
+
     void updateBounds() {
         mDisplay.getSize(mTmpDisplaySize);
         setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);
@@ -155,6 +165,7 @@
                 + " from displayId=" + mDisplayId);
         mStacks.remove(stack);
         removeStackReferenceIfNeeded(stack);
+        releaseSelfIfNeeded();
         mSupervisor.mService.updateSleepIfNeededLocked();
         onStackOrderChanged();
     }
@@ -484,16 +495,11 @@
         final int windowingMode = stack.getWindowingMode();
 
         if (activityType == ACTIVITY_TYPE_HOME) {
-            // TODO(b/111363427) Rollback to throws exceptions once we figure out how to properly
-            // deal with home type stack when external display removed
             if (mHomeStack != null && mHomeStack != stack) {
-                // throw new IllegalArgumentException("addStackReferenceIfNeeded: home stack="
-                //         + mHomeStack + " already exist on display=" + this + " stack=" + stack);
-                Slog.e(TAG, "addStackReferenceIfNeeded: home stack="
+                throw new IllegalArgumentException("addStackReferenceIfNeeded: home stack="
                         + mHomeStack + " already exist on display=" + this + " stack=" + stack);
-            } else {
-                mHomeStack = stack;
             }
+            mHomeStack = stack;
         } else if (activityType == ACTIVITY_TYPE_RECENTS) {
             if (mRecentsStack != null && mRecentsStack != stack) {
                 throw new IllegalArgumentException("addStackReferenceIfNeeded: recents stack="
@@ -796,28 +802,47 @@
         return false;
     }
 
+    /**
+     * @see #mRemoved
+     */
+    boolean isRemoved() {
+        return mRemoved;
+    }
+
     void remove() {
         final boolean destroyContentOnRemoval = shouldDestroyContentOnRemove();
-        while (getChildCount() > 0) {
-            final ActivityStack stack = getChildAt(0);
-            if (destroyContentOnRemoval) {
-                // Override the stack configuration to make it equal to the current applied one, so
-                // that we don't accidentally report configuration change to activities that are
-                // going to be finished.
-                stack.onOverrideConfigurationChanged(stack.getConfiguration());
-                mSupervisor.moveStackToDisplayLocked(stack.mStackId, DEFAULT_DISPLAY,
-                        false /* onTop */);
+
+        // Stacks could be reparented from the removed display to other display. While
+        // reparenting the last stack of the removed display, the remove display is ready to be
+        // released (no more ActivityStack). But, we cannot release it at that moment or the
+        // related WindowContainer and WindowContainerController will also be removed. So, we
+        // set display as removed after reparenting stack finished.
+        for (int i = mStacks.size() - 1; i >= 0; --i) {
+            final ActivityStack stack = mStacks.get(i);
+            // Always finish non-standard type stacks.
+            if (destroyContentOnRemoval || !stack.isActivityTypeStandardOrUndefined()) {
                 stack.finishAllActivitiesLocked(true /* immediately */);
             } else {
-                // Moving all tasks to fullscreen stack, because it's guaranteed to be
-                // a valid launch stack for all activities. This way the task history from
-                // external display will be preserved on primary after move.
-                mSupervisor.moveTasksToFullscreenStackLocked(stack, true /* onTop */);
+                // If default display is in split-window mode, set windowing mode of the stack to
+                // split-screen secondary. Otherwise, set the windowing mode to undefined by
+                // default to let stack inherited the windowing mode from the new display.
+                int windowingMode = mSupervisor.getDefaultDisplay().hasSplitScreenPrimaryStack()
+                        ? WINDOWING_MODE_SPLIT_SCREEN_SECONDARY : WINDOWING_MODE_UNDEFINED;
+                mSupervisor.moveStackToDisplayLocked(stack.mStackId, DEFAULT_DISPLAY, true);
+                stack.setWindowingMode(windowingMode);
             }
         }
+        mRemoved = true;
 
-        mWindowContainerController.removeContainer();
-        mWindowContainerController = null;
+        releaseSelfIfNeeded();
+    }
+
+    private void releaseSelfIfNeeded() {
+        if (mStacks.isEmpty() && mRemoved) {
+            mWindowContainerController.removeContainer();
+            mWindowContainerController = null;
+            mSupervisor.removeChild(this);
+        }
     }
 
     /** Update and get all UIDs that are present on the display and have access to it. */
diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java
index 9bf72fb..2c8f2fc 100644
--- a/services/core/java/com/android/server/am/ActivityManagerConstants.java
+++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java
@@ -67,6 +67,7 @@
     static final String KEY_BOUND_SERVICE_CRASH_RESTART_DURATION = "service_crash_restart_duration";
     static final String KEY_BOUND_SERVICE_CRASH_MAX_RETRY = "service_crash_max_retry";
     static final String KEY_PROCESS_START_ASYNC = "process_start_async";
+    static final String KEY_MEMORY_INFO_THROTTLE_TIME = "memory_info_throttle_time";
 
     private static final int DEFAULT_MAX_CACHED_PROCESSES = 32;
     private static final long DEFAULT_BACKGROUND_SETTLE_TIME = 60*1000;
@@ -95,7 +96,7 @@
     private static final long DEFAULT_BOUND_SERVICE_CRASH_RESTART_DURATION = 30*60_000;
     private static final int DEFAULT_BOUND_SERVICE_CRASH_MAX_RETRY = 16;
     private static final boolean DEFAULT_PROCESS_START_ASYNC = true;
-
+    private static final long DEFAULT_MEMORY_INFO_THROTTLE_TIME = 5*60*1000;
 
     // Maximum number of cached processes we will allow.
     public int MAX_CACHED_PROCESSES = DEFAULT_MAX_CACHED_PROCESSES;
@@ -207,6 +208,10 @@
     // Indicates if the processes need to be started asynchronously.
     public boolean FLAG_PROCESS_START_ASYNC = DEFAULT_PROCESS_START_ASYNC;
 
+    // The minimum time we allow between requests for the MemoryInfo of a process to
+    // throttle requests from apps.
+    public long MEMORY_INFO_THROTTLE_TIME = DEFAULT_MEMORY_INFO_THROTTLE_TIME;
+
     // Indicates whether the activity starts logging is enabled.
     // Controlled by Settings.Global.ACTIVITY_STARTS_LOGGING_ENABLED
     boolean mFlagActivityStartsLoggingEnabled;
@@ -348,6 +353,8 @@
                 DEFAULT_BOUND_SERVICE_CRASH_MAX_RETRY);
             FLAG_PROCESS_START_ASYNC = mParser.getBoolean(KEY_PROCESS_START_ASYNC,
                     DEFAULT_PROCESS_START_ASYNC);
+            MEMORY_INFO_THROTTLE_TIME = mParser.getLong(KEY_MEMORY_INFO_THROTTLE_TIME,
+                    DEFAULT_MEMORY_INFO_THROTTLE_TIME);
 
             updateMaxCachedProcesses();
         }
@@ -423,6 +430,14 @@
         pw.println(MAX_SERVICE_INACTIVITY);
         pw.print("  "); pw.print(KEY_BG_START_TIMEOUT); pw.print("=");
         pw.println(BG_START_TIMEOUT);
+        pw.print("  "); pw.print(KEY_BOUND_SERVICE_CRASH_RESTART_DURATION); pw.print("=");
+        pw.println(BOUND_SERVICE_CRASH_RESTART_DURATION);
+        pw.print("  "); pw.print(KEY_BOUND_SERVICE_CRASH_MAX_RETRY); pw.print("=");
+        pw.println(BOUND_SERVICE_MAX_CRASH_RETRY);
+        pw.print("  "); pw.print(KEY_PROCESS_START_ASYNC); pw.print("=");
+        pw.println(FLAG_PROCESS_START_ASYNC);
+        pw.print("  "); pw.print(KEY_MEMORY_INFO_THROTTLE_TIME); pw.print("=");
+        pw.println(MEMORY_INFO_THROTTLE_TIME);
 
         pw.println();
         if (mOverrideMaxCachedProcesses >= 0) {
diff --git a/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java b/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java
index 0a7d3fd..0e63d0c 100644
--- a/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java
+++ b/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java
@@ -46,7 +46,7 @@
 
     // Available log categories in the activity manager package.
     static final boolean DEBUG_ADD_REMOVE = DEBUG_ALL_ACTIVITIES || false;
-    static final boolean DEBUG_ANR = false;
+    static final boolean DEBUG_ANR = true;  // STOPSHIP disable it (b/113252928)
     static final boolean DEBUG_APP = DEBUG_ALL_ACTIVITIES || false;
     static final boolean DEBUG_BACKGROUND_CHECK = DEBUG_ALL || false;
     static final boolean DEBUG_BACKUP = DEBUG_ALL || false;
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index a826982..b91a449 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -1618,6 +1618,9 @@
                 break;
             }
             case DISPATCH_UIDS_CHANGED_UI_MSG: {
+                if (false) { // DO NOT SUBMIT WITH TRUE
+                    maybeTriggerWatchdog();
+                }
                 dispatchUidsChanged();
             } break;
             case DISPATCH_OOM_ADJ_OBSERVER_MSG: {
@@ -4567,18 +4570,19 @@
 
     /**
      * If a stack trace dump file is configured, dump process stack traces.
-     * @param clearTraces causes the dump file to be erased prior to the new
-     *    traces being written, if true; when false, the new traces will be
-     *    appended to any existing file content.
      * @param firstPids of dalvik VM processes to dump stack traces for first
      * @param lastPids of dalvik VM processes to dump stack traces for last
      * @param nativePids optional list of native pids to dump stack crawls
      */
-    public static File dumpStackTraces(boolean clearTraces, ArrayList<Integer> firstPids,
+    public static File dumpStackTraces(ArrayList<Integer> firstPids,
             ProcessCpuTracker processCpuTracker, SparseArray<Boolean> lastPids,
             ArrayList<Integer> nativePids) {
         ArrayList<Integer> extraPids = null;
 
+        if (DEBUG_ANR) {
+            Slog.d(TAG, "dumpStackTraces pids=" + lastPids + " nativepids=" + nativePids);
+        }
+
         // Measure CPU usage as soon as we're called in order to get a realistic sampling
         // of the top users at the time of the request.
         if (processCpuTracker != null) {
@@ -5196,27 +5200,56 @@
     @Override
     public Debug.MemoryInfo[] getProcessMemoryInfo(int[] pids) {
         enforceNotIsolatedCaller("getProcessMemoryInfo");
+
+        final long now = SystemClock.uptimeMillis();
+        final long lastNow = now - mConstants.MEMORY_INFO_THROTTLE_TIME;
+
+        final int callingPid = Binder.getCallingPid();
+        final int callingUid = Binder.getCallingUid();
+        final int userId = UserHandle.getUserId(callingUid);
+        final boolean allUsers = ActivityManager.checkUidPermission(INTERACT_ACROSS_USERS_FULL,
+                callingUid) == PackageManager.PERMISSION_GRANTED;
+        // Check REAL_GET_TASKS to see if they are allowed to access other uids
+        final boolean allUids = mAtmInternal.isGetTasksAllowed(
+                "getProcessMemoryInfo", callingPid, callingUid);
+
         Debug.MemoryInfo[] infos = new Debug.MemoryInfo[pids.length];
         for (int i=pids.length-1; i>=0; i--) {
-            ProcessRecord proc;
-            int oomAdj;
+            infos[i] = new Debug.MemoryInfo();
+            final ProcessRecord proc;
+            final int oomAdj;
             synchronized (this) {
                 synchronized (mPidsSelfLocked) {
                     proc = mPidsSelfLocked.get(pids[i]);
                     oomAdj = proc != null ? proc.setAdj : 0;
                 }
             }
-            infos[i] = new Debug.MemoryInfo();
-            long startTime = SystemClock.currentThreadTimeMillis();
-            Debug.getMemoryInfo(pids[i], infos[i]);
-            long endTime = SystemClock.currentThreadTimeMillis();
+            if (!allUids || (!allUsers && (proc == null
+                    || UserHandle.getUserId(proc.uid) != userId))) {
+                // The caller is not allow to get information about this other process...
+                // just leave it empty.
+                continue;
+            }
+            if (proc != null && proc.lastMemInfoTime >= lastNow && proc.lastMemInfo != null) {
+                // It hasn't been long enough that we want to take another sample; return
+                // the last one.
+                infos[i].set(proc.lastMemInfo);
+                continue;
+            }
+            final long startTime = SystemClock.currentThreadTimeMillis();
+            final Debug.MemoryInfo memInfo = new Debug.MemoryInfo();
+            Debug.getMemoryInfo(pids[i], memInfo);
+            final long endTime = SystemClock.currentThreadTimeMillis();
+            infos[i].set(memInfo);
             if (proc != null) {
                 synchronized (this) {
+                    proc.lastMemInfo = memInfo;
+                    proc.lastMemInfoTime = SystemClock.uptimeMillis();
                     if (proc.thread != null && proc.setAdj == oomAdj) {
                         // Record this for posterity if the process has been stable.
                         proc.baseProcessTracker.addPss(infos[i].getTotalPss(),
                                 infos[i].getTotalUss(), infos[i].getTotalRss(), false,
-                                ProcessStats.ADD_PSS_EXTERNAL_SLOW, endTime-startTime,
+                                ProcessStats.ADD_PSS_EXTERNAL_SLOW, endTime - startTime,
                                 proc.pkgList.mPkgList);
                         for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) {
                             ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);
@@ -5241,6 +5274,16 @@
     @Override
     public long[] getProcessPss(int[] pids) {
         enforceNotIsolatedCaller("getProcessPss");
+
+        final int callingPid = Binder.getCallingPid();
+        final int callingUid = Binder.getCallingUid();
+        final int userId = UserHandle.getUserId(callingUid);
+        final boolean allUsers = ActivityManager.checkUidPermission(INTERACT_ACROSS_USERS_FULL,
+                callingUid) == PackageManager.PERMISSION_GRANTED;
+        // Check REAL_GET_TASKS to see if they are allowed to access other uids
+        final boolean allUids = mAtmInternal.isGetTasksAllowed(
+                "getProcessPss", callingPid, callingUid);
+
         long[] pss = new long[pids.length];
         for (int i=pids.length-1; i>=0; i--) {
             ProcessRecord proc;
@@ -5251,6 +5294,11 @@
                     oomAdj = proc != null ? proc.setAdj : 0;
                 }
             }
+            if (!allUids || (!allUsers && UserHandle.getUserId(proc.uid) != userId)) {
+                // The caller is not allow to get information about this other process...
+                // just leave it empty.
+                continue;
+            }
             long[] tmpUss = new long[3];
             long startTime = SystemClock.currentThreadTimeMillis();
             pss[i] = Debug.getPss(pids[i], tmpUss, null);
@@ -8192,7 +8240,8 @@
             checkTime(startTime, "getContentProviderImpl: done!");
 
             grantEphemeralAccessLocked(userId, null /*intent*/,
-                    cpi.applicationInfo.uid, UserHandle.getAppId(Binder.getCallingUid()));
+                    UserHandle.getAppId(cpi.applicationInfo.uid),
+                    UserHandle.getAppId(Binder.getCallingUid()));
         }
 
         // Wait for the provider to be published...
@@ -17012,8 +17061,8 @@
             activeInstr.mUiAutomationConnection = uiAutomationConnection;
             activeInstr.mResultClass = className;
 
-            boolean disableHiddenApiChecks =
-                    (flags & INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0;
+            boolean disableHiddenApiChecks = ai.usesNonSdkApi
+                    || (flags & INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0;
             if (disableHiddenApiChecks) {
                 enforceCallingPermission(android.Manifest.permission.DISABLE_HIDDEN_API_CHECKS,
                         "disable hidden API checks");
@@ -21507,4 +21556,25 @@
             return superImpl.apply(permName, uid);
         }
     }
+
+    /**
+     * If debug.trigger.watchdog is set to 1, sleep 10 minutes with the AM lock held, which would
+     * cause a watchdog kill.
+     */
+    void maybeTriggerWatchdog() {
+        final String key = "debug.trigger.watchdog";
+        if (Watchdog.DEBUG && SystemProperties.getInt(key, 0) == 1) {
+            Slog.w(TAG, "!!! TRIGGERING WATCHDOG !!!");
+
+            // Clear the property; otherwise the system would hang again after a watchdog restart.
+            SystemProperties.set(key, "");
+            synchronized (ActivityManagerService.this) {
+                try {
+                    // Arbitrary long sleep for watchdog to catch.
+                    Thread.sleep(60 * 60 * 1000);
+                } catch (InterruptedException e) {
+                }
+            }
+        }
+    }
 }
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index fbf2855..355d890 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -36,6 +36,15 @@
 import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.Display.FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD;
 import static android.view.Display.INVALID_DISPLAY;
+import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE;
+import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN;
+import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE;
+import static android.view.WindowManager.TRANSIT_NONE;
+import static android.view.WindowManager.TRANSIT_TASK_CLOSE;
+import static android.view.WindowManager.TRANSIT_TASK_OPEN;
+import static android.view.WindowManager.TRANSIT_TASK_OPEN_BEHIND;
+import static android.view.WindowManager.TRANSIT_TASK_TO_BACK;
+import static android.view.WindowManager.TRANSIT_TASK_TO_FRONT;
 
 import static com.android.server.am.ActivityDisplay.POSITION_BOTTOM;
 import static com.android.server.am.ActivityDisplay.POSITION_TOP;
@@ -82,10 +91,6 @@
 import static com.android.server.am.ActivityStack.ActivityState.RESUMED;
 import static com.android.server.am.ActivityStack.ActivityState.STOPPED;
 import static com.android.server.am.ActivityStack.ActivityState.STOPPING;
-import static com.android.server.am.ActivityStackSupervisor.FindTaskResult;
-import static com.android.server.am.ActivityStackSupervisor.PAUSE_IMMEDIATELY;
-import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS;
-import static com.android.server.am.ActivityStackSupervisor.REMOVE_FROM_RECENTS;
 import static com.android.server.am.ActivityStackProto.BOUNDS;
 import static com.android.server.am.ActivityStackProto.CONFIGURATION_CONTAINER;
 import static com.android.server.am.ActivityStackProto.DISPLAY_ID;
@@ -93,15 +98,10 @@
 import static com.android.server.am.ActivityStackProto.ID;
 import static com.android.server.am.ActivityStackProto.RESUMED_ACTIVITY;
 import static com.android.server.am.ActivityStackProto.TASKS;
-import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE;
-import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN;
-import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE;
-import static android.view.WindowManager.TRANSIT_NONE;
-import static android.view.WindowManager.TRANSIT_TASK_CLOSE;
-import static android.view.WindowManager.TRANSIT_TASK_OPEN;
-import static android.view.WindowManager.TRANSIT_TASK_OPEN_BEHIND;
-import static android.view.WindowManager.TRANSIT_TASK_TO_BACK;
-import static android.view.WindowManager.TRANSIT_TASK_TO_FRONT;
+import static com.android.server.am.ActivityStackSupervisor.FindTaskResult;
+import static com.android.server.am.ActivityStackSupervisor.PAUSE_IMMEDIATELY;
+import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS;
+import static com.android.server.am.ActivityStackSupervisor.REMOVE_FROM_RECENTS;
 
 import static java.lang.Integer.MAX_VALUE;
 
@@ -115,12 +115,12 @@
 import android.app.WindowConfiguration.WindowingMode;
 import android.app.servertransaction.ActivityResultItem;
 import android.app.servertransaction.ClientTransaction;
-import android.app.servertransaction.NewIntentItem;
-import android.app.servertransaction.WindowVisibilityItem;
 import android.app.servertransaction.DestroyActivityItem;
+import android.app.servertransaction.NewIntentItem;
 import android.app.servertransaction.PauseActivityItem;
 import android.app.servertransaction.ResumeActivityItem;
 import android.app.servertransaction.StopActivityItem;
+import android.app.servertransaction.WindowVisibilityItem;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -775,6 +775,11 @@
                 true /* includingParents */);
     }
 
+    void positionChildWindowContainerAtBottom(TaskRecord child) {
+        mWindowContainerController.positionChildAtBottom(child.getWindowContainerController(),
+                true /* includingParents */);
+    }
+
     /**
      * Returns whether to defer the scheduling of the multi-window mode.
      */
@@ -2859,8 +2864,7 @@
         final int position = getAdjustedPositionForTask(task, mTaskHistory.size(), starting);
         mTaskHistory.add(position, task);
         updateTaskMovement(task, true);
-        mWindowContainerController.positionChildAtTop(task.getWindowContainerController(),
-                true /* includingParents */);
+        positionChildWindowContainerAtTop(task);
     }
 
     private void insertTaskAtBottom(TaskRecord task) {
@@ -2869,8 +2873,7 @@
         final int position = getAdjustedPositionForTask(task, 0, null);
         mTaskHistory.add(position, task);
         updateTaskMovement(task, true);
-        mWindowContainerController.positionChildAtBottom(task.getWindowContainerController(),
-                true /* includingParents */);
+        positionChildWindowContainerAtBottom(task);
     }
 
     void startActivityLocked(ActivityRecord r, ActivityRecord focusedTopActivity,
@@ -3141,8 +3144,7 @@
                     p.reparent(targetTask, 0 /* position - bottom */, "resetTargetTaskIfNeeded");
                 }
 
-                mWindowContainerController.positionChildAtBottom(
-                        targetTask.getWindowContainerController(), false /* includingParents */);
+                positionChildWindowContainerAtBottom(targetTask);
                 replyChainEnd = -1;
             } else if (forceReset || finishOnTaskLaunch || clearWhenTaskReset) {
                 // If the activity should just be removed -- either
@@ -3277,8 +3279,7 @@
                         if (DEBUG_TASKS) Slog.v(TAG_TASKS, "Pulling activity " + p
                                 + " from " + srcPos + " in to resetting task " + task);
                     }
-                    mWindowContainerController.positionChildAtTop(
-                            task.getWindowContainerController(), true /* includingParents */);
+                    positionChildWindowContainerAtTop(task);
 
                     // Now we've moved it in to place...  but what if this is
                     // a singleTop activity and we have put it on top of another
@@ -5191,7 +5192,7 @@
             if (isAttached()) {
                 getDisplay().positionChildAtBottom(this);
             }
-            if (!isActivityTypeHome()) {
+            if (!isActivityTypeHome() || getDisplay().isRemoved()) {
                 remove();
             }
         }
@@ -5239,8 +5240,7 @@
         addTask(task, toTop ? MAX_VALUE : 0, true /* schedulePictureInPictureModeChange */, reason);
         if (toTop) {
             // TODO: figure-out a way to remove this call.
-            mWindowContainerController.positionChildAtTop(task.getWindowContainerController(),
-                    true /* includingParents */);
+            positionChildWindowContainerAtTop(task);
         }
     }
 
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 9809bfa..1ffdc67 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -48,6 +48,7 @@
 import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.Display.INVALID_DISPLAY;
 import static android.view.Display.TYPE_VIRTUAL;
+import static android.view.WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;
 
 import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL;
 import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_FOCUS;
@@ -81,13 +82,6 @@
 import static com.android.server.am.ActivityStack.ActivityState.STOPPED;
 import static com.android.server.am.ActivityStack.ActivityState.STOPPING;
 import static com.android.server.am.ActivityStack.REMOVE_TASK_MODE_MOVING;
-import static com.android.server.am.TaskRecord.INVALID_TASK_ID;
-import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE;
-import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE_PRIV;
-import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_WHITELISTED;
-import static com.android.server.am.TaskRecord.REPARENT_KEEP_STACK_AT_FRONT;
-import static com.android.server.am.TaskRecord.REPARENT_LEAVE_STACK_IN_PLACE;
-import static com.android.server.am.TaskRecord.REPARENT_MOVE_STACK_TO_FRONT;
 import static com.android.server.am.ActivityStackSupervisorProto.CONFIGURATION_CONTAINER;
 import static com.android.server.am.ActivityStackSupervisorProto.DISPLAYS;
 import static com.android.server.am.ActivityStackSupervisorProto.FOCUSED_STACK_ID;
@@ -95,7 +89,13 @@
 import static com.android.server.am.ActivityStackSupervisorProto.KEYGUARD_CONTROLLER;
 import static com.android.server.am.ActivityStackSupervisorProto.PENDING_ACTIVITIES;
 import static com.android.server.am.ActivityStackSupervisorProto.RESUMED_ACTIVITY;
-import static android.view.WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;
+import static com.android.server.am.TaskRecord.INVALID_TASK_ID;
+import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE;
+import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE_PRIV;
+import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_WHITELISTED;
+import static com.android.server.am.TaskRecord.REPARENT_KEEP_STACK_AT_FRONT;
+import static com.android.server.am.TaskRecord.REPARENT_LEAVE_STACK_IN_PLACE;
+import static com.android.server.am.TaskRecord.REPARENT_MOVE_STACK_TO_FRONT;
 
 import static java.lang.Integer.MAX_VALUE;
 
@@ -109,8 +109,6 @@
 import android.app.ActivityManager.RunningTaskInfo;
 import android.app.ActivityManager.StackInfo;
 import android.app.ActivityManagerInternal;
-import com.android.internal.util.function.pooled.PooledLambda;
-import com.android.server.wm.ActivityTaskManagerInternal.SleepToken;
 import android.app.ActivityOptions;
 import android.app.AppOpsManager;
 import android.app.ProfilerInfo;
@@ -170,13 +168,18 @@
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.content.ReferrerIntent;
-import com.android.internal.os.logging.MetricsLoggerWrapper;
 import com.android.internal.os.TransferPipe;
+import com.android.internal.os.logging.MetricsLoggerWrapper;
 import com.android.internal.util.ArrayUtils;
+import com.android.internal.util.function.pooled.PooledLambda;
 import com.android.server.LocalServices;
 import com.android.server.am.ActivityStack.ActivityState;
+import com.android.server.wm.ActivityTaskManagerInternal.SleepToken;
 import com.android.server.wm.ConfigurationContainer;
+import com.android.server.wm.DisplayWindowController;
 import com.android.server.wm.PinnedStackWindowController;
+import com.android.server.wm.RootWindowContainerController;
+import com.android.server.wm.RootWindowContainerListener;
 import com.android.server.wm.WindowManagerService;
 
 import java.io.FileDescriptor;
@@ -190,7 +193,7 @@
 import java.util.Set;
 
 public class ActivityStackSupervisor extends ConfigurationContainer implements DisplayListener,
-        RecentTasks.Callbacks {
+        RecentTasks.Callbacks, RootWindowContainerListener {
     private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityStackSupervisor" : TAG_AM;
     private static final String TAG_FOCUS = TAG + POSTFIX_FOCUS;
     private static final String TAG_IDLE = TAG + POSTFIX_IDLE;
@@ -416,9 +419,14 @@
     /** Stack id of the front stack when user switched, indexed by userId. */
     SparseIntArray mUserStackInFront = new SparseIntArray(2);
 
-    // TODO: There should be an ActivityDisplayController coordinating am/wm interaction.
-    /** Mapping from displayId to display current state */
-    private final SparseArray<ActivityDisplay> mActivityDisplays = new SparseArray<>();
+    /** Reference to default display so we can quickly look it up. */
+    private ActivityDisplay mDefaultDisplay;
+
+    /**
+     * List of displays which contain activities, sorted by z-order.
+     * The last entry in the list is the topmost.
+     */
+    private final ArrayList<ActivityDisplay> mActivityDisplays = new ArrayList<>();
 
     private final SparseArray<IntArray> mDisplayAccessUIDs = new SparseArray<>();
 
@@ -453,7 +461,7 @@
 
     @Override
     protected ActivityDisplay getChildAt(int index) {
-        return mActivityDisplays.valueAt(index);
+        return mActivityDisplays.get(index);
     }
 
     @Override
@@ -531,13 +539,6 @@
     private final FindTaskResult mTmpFindTaskResult = new FindTaskResult();
 
     /**
-     * Temp storage for display ids sorted in focus order.
-     * Maps position to id. Using {@link SparseIntArray} instead of {@link ArrayList} because
-     * it's more efficient, as the number of displays is usually small.
-     */
-    private SparseIntArray mTmpOrderedDisplayIds = new SparseIntArray();
-
-    /**
      * Used to keep track whether app visibilities got changed since the last pause. Useful to
      * determine whether to invoke the task stack change listener after pausing.
      */
@@ -569,6 +570,8 @@
 
     private boolean mInitialized;
 
+    private RootWindowContainerController mWindowContainerController;
+
     /**
      * Description of a request to start a new activity, which has been held
      * due to app switches being disabled.
@@ -612,6 +615,11 @@
         mService = service;
     }
 
+    @VisibleForTesting
+    void setWindowContainerController(RootWindowContainerController controller) {
+        mWindowContainerController = controller;
+    }
+
     public void initialize() {
         if (mInitialized) {
             return;
@@ -664,38 +672,57 @@
     void setWindowManager(WindowManagerService wm) {
         mWindowManager = wm;
         getKeyguardController().setWindowManager(wm);
+        setWindowContainerController(new RootWindowContainerController(this));
 
-        mDisplayManager =
-                (DisplayManager) mService.mContext.getSystemService(Context.DISPLAY_SERVICE);
+        mDisplayManager = mService.mContext.getSystemService(DisplayManager.class);
         mDisplayManager.registerDisplayListener(this, null);
         mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);
 
-        Display[] displays = mDisplayManager.getDisplays();
+        final Display[] displays = mDisplayManager.getDisplays();
         for (int displayNdx = displays.length - 1; displayNdx >= 0; --displayNdx) {
             final Display display = displays[displayNdx];
-            ActivityDisplay activityDisplay = new ActivityDisplay(this, display);
-            mActivityDisplays.put(display.getDisplayId(), activityDisplay);
+            final ActivityDisplay activityDisplay = new ActivityDisplay(this, display);
+            if (activityDisplay.mDisplayId == DEFAULT_DISPLAY) {
+                mDefaultDisplay = activityDisplay;
+            }
+            addChild(activityDisplay, ActivityDisplay.POSITION_TOP);
             calculateDefaultMinimalSizeOfResizeableTasks(activityDisplay);
         }
 
         final ActivityDisplay defaultDisplay = getDefaultDisplay();
         mHomeStack = mLastFocusedStack = defaultDisplay.getOrCreateStack(
                 WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
+        positionChildAt(defaultDisplay, ActivityDisplay.POSITION_TOP);
+    }
+
+    /** Change the z-order of the given display. */
+    private void positionChildAt(ActivityDisplay display, int position) {
+        if (position >= mActivityDisplays.size()) {
+            position = mActivityDisplays.size() - 1;
+        } else if (position < 0) {
+            position = 0;
+        }
+
+        if (mActivityDisplays.isEmpty()) {
+            mActivityDisplays.add(display);
+        } else if (mActivityDisplays.get(position) != display) {
+            mActivityDisplays.remove(display);
+            mActivityDisplays.add(position, display);
+        }
+    }
+
+    @Override
+    public void onChildPositionChanged(DisplayWindowController childController, int position) {
+        // Assume AM lock is held from positionChildAt of controller in each hierarchy.
+        final ActivityDisplay display = getActivityDisplay(childController.getDisplayId());
+        if (display != null) {
+            positionChildAt(display, position);
+        }
     }
 
     ActivityStack getTopDisplayFocusedStack() {
-        mWindowManager.getDisplaysInFocusOrder(mTmpOrderedDisplayIds);
-
-        for (int i = mTmpOrderedDisplayIds.size() - 1; i >= 0; --i) {
-            final int displayId = mTmpOrderedDisplayIds.get(i);
-            final ActivityDisplay display = mActivityDisplays.get(displayId);
-
-            // If WindowManagerService has encountered the display before we have, ignore as there
-            // will be no stacks present and therefore no activities.
-            if (display == null) {
-                continue;
-            }
-            final ActivityStack focusedStack = display.getFocusedStack();
+        for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
+            final ActivityStack focusedStack = mActivityDisplays.get(i).getFocusedStack();
             if (focusedStack != null) {
                 return focusedStack;
             }
@@ -718,16 +745,8 @@
         }
         // The top focused stack might not have a resumed activity yet - look on all displays in
         // focus order.
-        mWindowManager.getDisplaysInFocusOrder(mTmpOrderedDisplayIds);
-        for (int i = mTmpOrderedDisplayIds.size() - 1; i >= 0; --i) {
-            final int displayId = mTmpOrderedDisplayIds.get(i);
-            final ActivityDisplay display = mActivityDisplays.get(displayId);
-
-            // If WindowManagerService has encountered the display before we have, ignore as there
-            // will be no stacks present and therefore no activities.
-            if (display == null) {
-                continue;
-            }
+        for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
+            final ActivityDisplay display = mActivityDisplays.get(i);
             final ActivityRecord resumedActivityOnDisplay = display.getResumedActivity();
             if (resumedActivityOnDisplay != null) {
                 return resumedActivityOnDisplay;
@@ -848,7 +867,7 @@
 
         int numDisplays = mActivityDisplays.size();
         for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 final TaskRecord task = stack.taskForIdLocked(id);
@@ -905,7 +924,7 @@
     ActivityRecord isInAnyStackLocked(IBinder token) {
         int numDisplays = mActivityDisplays.size();
         for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 final ActivityRecord r = stack.isInStackLocked(token);
@@ -947,7 +966,7 @@
         mWindowManager.deferSurfaceLayout();
         try {
             for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-                final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+                final ActivityDisplay display = mActivityDisplays.get(displayNdx);
                 for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                     final ActivityStack stack = display.getChildAt(stackNdx);
                     final List<TaskRecord> tasks = stack.getAllTasks();
@@ -1011,7 +1030,7 @@
         final String processName = app.processName;
         boolean didSomething = false;
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 if (!isTopDisplayFocusedStack(stack)) {
@@ -1046,7 +1065,7 @@
 
     boolean allResumedActivitiesIdle() {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 if (!isTopDisplayFocusedStack(stack) || stack.numActivities() == 0) {
@@ -1067,7 +1086,7 @@
 
     boolean allResumedActivitiesComplete() {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 if (isTopDisplayFocusedStack(stack)) {
@@ -1090,7 +1109,7 @@
     private boolean allResumedActivitiesVisible() {
         boolean foundResumed = false;
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 final ActivityRecord r = stack.getResumedActivity();
@@ -1116,7 +1135,7 @@
     boolean pauseBackStacks(boolean userLeaving, ActivityRecord resuming, boolean dontWait) {
         boolean someActivityPaused = false;
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            someActivityPaused |= mActivityDisplays.valueAt(displayNdx)
+            someActivityPaused |= mActivityDisplays.get(displayNdx)
                     .pauseBackStacks(userLeaving, resuming, dontWait);
         }
         return someActivityPaused;
@@ -1125,7 +1144,7 @@
     boolean allPausedActivitiesComplete() {
         boolean pausing = true;
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 final ActivityRecord r = stack.mPausingActivity;
@@ -1145,7 +1164,7 @@
 
     void cancelInitializingActivities() {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 stack.cancelInitializingActivities();
@@ -1266,17 +1285,8 @@
         }
 
         // Look in other non-focused and non-home stacks.
-        mWindowManager.getDisplaysInFocusOrder(mTmpOrderedDisplayIds);
-
-        for (int i = mTmpOrderedDisplayIds.size() - 1; i >= 0; --i) {
-            final int displayId = mTmpOrderedDisplayIds.get(i);
-            final ActivityDisplay display = mActivityDisplays.get(displayId);
-
-            // If WindowManagerService has encountered the display before we have, ignore as there
-            // will be no stacks present and therefore no activities.
-            if (display == null) {
-                continue;
-            }
+        for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
+            final ActivityDisplay display = mActivityDisplays.get(i);
 
             // TODO: We probably want to consider the top fullscreen stack as we could have a pinned
             // stack on top.
@@ -1757,7 +1767,7 @@
             boolean noResumedActivities = true;
             boolean allFocusedProcessesDiffer = true;
             for (int displayNdx = 0; displayNdx < mActivityDisplays.size(); ++displayNdx) {
-                final ActivityDisplay activityDisplay = mActivityDisplays.valueAt(displayNdx);
+                final ActivityDisplay activityDisplay = mActivityDisplays.get(displayNdx);
                 final ActivityRecord resumedActivity = activityDisplay.getResumedActivity();
                 final WindowProcessController resumedActivityProcess =
                     resumedActivity == null ? null : resumedActivity.app;
@@ -1862,7 +1872,7 @@
         }
 
         final ActivityDisplay activityDisplay = getActivityDisplayOrCreateLocked(launchDisplayId);
-        if (activityDisplay == null) {
+        if (activityDisplay == null || activityDisplay.isRemoved()) {
             Slog.w(TAG, "Launch on display check: display not found");
             return false;
         }
@@ -1927,7 +1937,7 @@
     void updateUIDsPresentOnDisplay() {
         mDisplayAccessUIDs.clear();
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay activityDisplay = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay activityDisplay = mActivityDisplays.get(displayNdx);
             // Only bother calculating the whitelist for private displays
             if (activityDisplay.isPrivate()) {
                 mDisplayAccessUIDs.append(
@@ -2173,7 +2183,7 @@
     boolean handleAppDiedLocked(WindowProcessController app) {
         boolean hasVisibleActivities = false;
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 hasVisibleActivities |= stack.handleAppDiedLocked(app);
@@ -2184,7 +2194,7 @@
 
     void closeSystemDialogsLocked() {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 stack.closeSystemDialogsLocked();
@@ -2213,7 +2223,7 @@
             boolean doit, boolean evenPersistent, int userId) {
         boolean didSomething = false;
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 if (stack.finishDisabledPackageActivitiesLocked(
@@ -2235,7 +2245,7 @@
         // hosted by the process that is actually still the foreground.
         WindowProcessController fgApp = null;
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 if (isTopDisplayFocusedStack(stack)) {
@@ -2277,7 +2287,7 @@
 
         // Resume all top activities in focused stacks on all displays.
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             final ActivityStack focusedStack = display.getFocusedStack();
             if (focusedStack == null) {
                 continue;
@@ -2296,7 +2306,7 @@
 
     void updateActivityApplicationInfoLocked(ApplicationInfo aInfo) {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 stack.updateActivityApplicationInfoLocked(aInfo);
@@ -2314,7 +2324,7 @@
         TaskRecord finishedTask = null;
         ActivityStack focusedStack = getTopDisplayFocusedStack();
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             // It is possible that request to finish activity might also remove its task and stack,
             // so we need to be careful with indexes in the loop and check child count every time.
             for (int stackNdx = 0; stackNdx < display.getChildCount(); ++stackNdx) {
@@ -2330,7 +2340,7 @@
 
     void finishVoiceTask(IVoiceInteractionSession session) {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             final int numStacks = display.getChildCount();
             for (int stackNdx = 0; stackNdx < numStacks; ++stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
@@ -2417,7 +2427,7 @@
 
     protected <T extends ActivityStack> T getStack(int stackId) {
         for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
-            final T stack = mActivityDisplays.valueAt(i).getStack(stackId);
+            final T stack = mActivityDisplays.get(i).getStack(stackId);
             if (stack != null) {
                 return stack;
             }
@@ -2428,7 +2438,7 @@
     /** @see ActivityDisplay#getStack(int, int) */
     private <T extends ActivityStack> T getStack(int windowingMode, int activityType) {
         for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
-            final T stack = mActivityDisplays.valueAt(i).getStack(windowingMode, activityType);
+            final T stack = mActivityDisplays.get(i).getStack(windowingMode, activityType);
             if (stack != null) {
                 return stack;
             }
@@ -2642,19 +2652,12 @@
         }
 
         // Now look through all displays
-        mWindowManager.getDisplaysInFocusOrder(mTmpOrderedDisplayIds);
-        for (int i = mTmpOrderedDisplayIds.size() - 1; i >= 0; --i) {
-            final int displayId = mTmpOrderedDisplayIds.get(i);
-            if (displayId == preferredDisplay.mDisplayId) {
+        for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
+            final ActivityDisplay display = mActivityDisplays.get(i);
+            if (display == preferredDisplay) {
                 // We've already checked this one
                 continue;
             }
-            // If a display is registered in WM, it must also be available in AM.
-            final ActivityDisplay display = getActivityDisplayOrCreateLocked(displayId);
-            if (display == null) {
-                // Looks like the display no longer exists in the system...
-                continue;
-            }
             final ActivityStack nextFocusableStack = display.getNextFocusableStack(currentFocus,
                     ignoreCurrent);
             if (nextFocusableStack != null) {
@@ -2676,13 +2679,12 @@
      * @return Next valid {@link ActivityStack}, null if not found.
      */
     ActivityStack getNextValidLaunchStackLocked(@NonNull ActivityRecord r, int currentFocus) {
-        mWindowManager.getDisplaysInFocusOrder(mTmpOrderedDisplayIds);
-        for (int i = mTmpOrderedDisplayIds.size() - 1; i >= 0; --i) {
-            final int displayId = mTmpOrderedDisplayIds.get(i);
-            if (displayId == currentFocus) {
+        for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
+            final ActivityDisplay display = mActivityDisplays.get(i);
+            if (display.mDisplayId == currentFocus) {
                 continue;
             }
-            final ActivityStack stack = getValidLaunchStackOnDisplay(displayId, r,
+            final ActivityStack stack = getValidLaunchStackOnDisplay(display.mDisplayId, r,
                     null /* options */);
             if (stack != null) {
                 return stack;
@@ -3081,13 +3083,13 @@
      */
     void removeStacksInWindowingModes(int... windowingModes) {
         for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
-            mActivityDisplays.valueAt(i).removeStacksInWindowingModes(windowingModes);
+            mActivityDisplays.get(i).removeStacksInWindowingModes(windowingModes);
         }
     }
 
     void removeStacksWithActivityTypes(int... activityTypes) {
         for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
-            mActivityDisplays.valueAt(i).removeStacksWithActivityTypes(activityTypes);
+            mActivityDisplays.get(i).removeStacksWithActivityTypes(activityTypes);
         }
     }
 
@@ -3463,7 +3465,7 @@
         ActivityRecord affinityMatch = null;
         if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Looking for task of " + r);
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 if (!r.hasCompatibleActivityType(stack)) {
@@ -3500,7 +3502,7 @@
     ActivityRecord findActivityLocked(Intent intent, ActivityInfo info,
             boolean compareIntentFilters) {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 final ActivityRecord ar = stack.findActivityLocked(
@@ -3515,7 +3517,7 @@
 
     boolean hasAwakeDisplay() {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             if (!display.shouldSleep()) {
                 return true;
             }
@@ -3543,7 +3545,7 @@
 
     void prepareForShutdownLocked() {
         for (int i = 0; i < mActivityDisplays.size(); i++) {
-            createSleepTokenLocked("shutdown", mActivityDisplays.keyAt(i));
+            createSleepTokenLocked("shutdown", mActivityDisplays.get(i).mDisplayId);
         }
     }
 
@@ -3586,7 +3588,7 @@
     void applySleepTokensLocked(boolean applyToStacks) {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
             // Set the sleeping state of the display.
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             final boolean displayShouldSleep = display.shouldSleep();
             if (displayShouldSleep == display.isSleeping()) {
                 continue;
@@ -3666,7 +3668,7 @@
     private boolean putStacksToSleepLocked(boolean allowDelay, boolean shuttingDown) {
         boolean allSleep = true;
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 if (allowDelay) {
@@ -3697,7 +3699,7 @@
 
     void handleAppCrashLocked(WindowProcessController app) {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 stack.handleAppCrashLocked(app);
@@ -3746,7 +3748,7 @@
         try {
             // First the front stacks. In case any are not fullscreen and are in front of home.
             for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-                final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+                final ActivityDisplay display = mActivityDisplays.get(displayNdx);
                 for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                     final ActivityStack stack = display.getChildAt(stackNdx);
                     stack.ensureActivitiesVisibleLocked(starting, configChanges, preserveWindows,
@@ -3760,7 +3762,7 @@
 
     void addStartingWindowsForVisibleActivities(boolean taskSwitch) {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 stack.addStartingWindowsForVisibleActivities(taskSwitch);
@@ -3778,7 +3780,7 @@
         }
         mTaskLayersChanged = false;
         for (int displayNdx = 0; displayNdx < mActivityDisplays.size(); displayNdx++) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             int baseLayer = 0;
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
@@ -3789,7 +3791,7 @@
 
     void clearOtherAppTimeTrackers(AppTimeTracker except) {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 stack.clearOtherAppTimeTrackers(except);
@@ -3799,7 +3801,7 @@
 
     void scheduleDestroyAllActivities(WindowProcessController app, String reason) {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 stack.scheduleDestroyActivities(app, reason);
@@ -3818,7 +3820,7 @@
         // let's iterate through the tasks and release the oldest one.
         final int numDisplays = mActivityDisplays.size();
         for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             final int stackCount = display.getChildCount();
             // Step through all stacks starting from behind, to hit the oldest things first.
             for (int stackNdx = 0; stackNdx < stackCount; stackNdx++) {
@@ -3849,7 +3851,7 @@
 
         mStartingUsers.add(uss);
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 stack.switchUserLocked(userId);
@@ -3953,7 +3955,7 @@
 
     void validateTopActivitiesLocked() {
         for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 final ActivityRecord r = stack.topRunningActivityLocked();
@@ -3984,7 +3986,7 @@
 
     public void dumpDisplays(PrintWriter pw) {
         for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(i);
+            final ActivityDisplay display = mActivityDisplays.get(i);
             pw.print("[id:" + display.mDisplayId + " stacks:");
             display.dumpStacks(pw);
             pw.print("]");
@@ -3998,7 +4000,7 @@
         pw.println("mCurTaskIdForUser=" + mCurTaskIdForUser);
         pw.print(prefix); pw.println("mUserStackInFront=" + mUserStackInFront);
         for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(i);
+            final ActivityDisplay display = mActivityDisplays.get(i);
             display.dump(pw, prefix);
         }
         if (!mWaitingForActivityVisible.isEmpty()) {
@@ -4018,7 +4020,7 @@
         final long token = proto.start(fieldId);
         super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);
         for (int displayNdx = 0; displayNdx < mActivityDisplays.size(); ++displayNdx) {
-            final ActivityDisplay activityDisplay = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay activityDisplay = mActivityDisplays.get(displayNdx);
             activityDisplay.writeToProto(proto, DISPLAYS);
         }
         getKeyguardController().writeToProto(proto, KEYGUARD_CONTROLLER);
@@ -4047,7 +4049,7 @@
         pw.print(prefix); pw.println("Display override configurations:");
         final int displayCount = mActivityDisplays.size();
         for (int i = 0; i < displayCount; i++) {
-            final ActivityDisplay activityDisplay = mActivityDisplays.valueAt(i);
+            final ActivityDisplay activityDisplay = mActivityDisplays.get(i);
             pw.print(prefix); pw.print("  "); pw.print(activityDisplay.mDisplayId); pw.print(": ");
                     pw.println(activityDisplay.getOverrideConfiguration());
         }
@@ -4065,7 +4067,7 @@
             ArrayList<ActivityRecord> activities = new ArrayList<>();
             int numDisplays = mActivityDisplays.size();
             for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {
-                final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+                final ActivityDisplay display = mActivityDisplays.get(displayNdx);
                 for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                     final ActivityStack stack = display.getChildAt(stackNdx);
                     if (!dumpVisibleStacksOnly || stack.shouldBeVisible(null)) {
@@ -4096,11 +4098,11 @@
             boolean dumpClient, String dumpPackage) {
         boolean printed = false;
         boolean needSep = false;
-        for (int displayNdx = 0; displayNdx < mActivityDisplays.size(); ++displayNdx) {
-            ActivityDisplay activityDisplay = mActivityDisplays.valueAt(displayNdx);
+        for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
+            ActivityDisplay activityDisplay = mActivityDisplays.get(displayNdx);
             pw.print("Display #"); pw.print(activityDisplay.mDisplayId);
                     pw.println(" (activities from top to bottom):");
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 pw.println();
@@ -4299,12 +4301,18 @@
 
     // TODO: Look into consolidating with getActivityDisplayOrCreateLocked()
     ActivityDisplay getActivityDisplay(int displayId) {
-        return mActivityDisplays.get(displayId);
+        for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
+            final ActivityDisplay activityDisplay = mActivityDisplays.get(i);
+            if (activityDisplay.mDisplayId == displayId) {
+                return activityDisplay;
+            }
+        }
+        return null;
     }
 
     // TODO(multi-display): Look at all callpoints to make sure they make sense in multi-display.
     ActivityDisplay getDefaultDisplay() {
-        return mActivityDisplays.get(DEFAULT_DISPLAY);
+        return mDefaultDisplay;
     }
 
     /**
@@ -4313,7 +4321,7 @@
      */
     // TODO: Look into consolidating with getActivityDisplay()
     ActivityDisplay getActivityDisplayOrCreateLocked(int displayId) {
-        ActivityDisplay activityDisplay = mActivityDisplays.get(displayId);
+        ActivityDisplay activityDisplay = getActivityDisplay(displayId);
         if (activityDisplay != null) {
             return activityDisplay;
         }
@@ -4328,15 +4336,23 @@
         }
         // The display hasn't been added to ActivityManager yet, create a new record now.
         activityDisplay = new ActivityDisplay(this, display);
-        attachDisplay(activityDisplay);
+        addChild(activityDisplay, ActivityDisplay.POSITION_BOTTOM);
         calculateDefaultMinimalSizeOfResizeableTasks(activityDisplay);
         mWindowManager.onDisplayAdded(displayId);
         return activityDisplay;
     }
 
     @VisibleForTesting
-    void attachDisplay(ActivityDisplay display) {
-        mActivityDisplays.put(display.mDisplayId, display);
+    void addChild(ActivityDisplay activityDisplay, int position) {
+        positionChildAt(activityDisplay, position);
+        mWindowContainerController.positionChildAt(
+                activityDisplay.getWindowContainerController(), position);
+    }
+
+    void removeChild(ActivityDisplay activityDisplay) {
+        // The caller must tell the controller of {@link ActivityDisplay} to release its container
+        // {@link DisplayContent}. That is done in {@link ActivityDisplay#releaseSelfIfNeeded}).
+        mActivityDisplays.remove(activityDisplay);
     }
 
     private void calculateDefaultMinimalSizeOfResizeableTasks(ActivityDisplay display) {
@@ -4351,7 +4367,7 @@
         }
 
         synchronized (mService.mGlobalLock) {
-            final ActivityDisplay activityDisplay = mActivityDisplays.get(displayId);
+            final ActivityDisplay activityDisplay = getActivityDisplay(displayId);
             if (activityDisplay == null) {
                 return;
             }
@@ -4359,14 +4375,12 @@
             activityDisplay.remove();
 
             releaseSleepTokens(activityDisplay);
-
-            mActivityDisplays.remove(displayId);
         }
     }
 
     private void handleDisplayChanged(int displayId) {
         synchronized (mService.mGlobalLock) {
-            ActivityDisplay activityDisplay = mActivityDisplays.get(displayId);
+            ActivityDisplay activityDisplay = getActivityDisplay(displayId);
             // TODO: The following code block should be moved into {@link ActivityDisplay}.
             if (activityDisplay != null) {
                 // The window policy is responsible for stopping activities on the default display
@@ -4389,7 +4403,7 @@
     }
 
     SleepToken createSleepTokenLocked(String tag, int displayId) {
-        ActivityDisplay display = mActivityDisplays.get(displayId);
+        final ActivityDisplay display = getActivityDisplay(displayId);
         if (display == null) {
             throw new IllegalArgumentException("Invalid display: " + displayId);
         }
@@ -4403,7 +4417,7 @@
     private void removeSleepTokenLocked(SleepTokenImpl token) {
         mSleepTokens.remove(token);
 
-        ActivityDisplay display = mActivityDisplays.get(token.mDisplayId);
+        final ActivityDisplay display = getActivityDisplay(token.mDisplayId);
         if (display != null) {
             display.mAllSleepTokens.remove(token);
             if (display.mAllSleepTokens.isEmpty()) {
@@ -4426,7 +4440,7 @@
 
     private StackInfo getStackInfo(ActivityStack stack) {
         final int displayId = stack.mDisplayId;
-        final ActivityDisplay display = mActivityDisplays.get(displayId);
+        final ActivityDisplay display = getActivityDisplay(displayId);
         StackInfo info = new StackInfo();
         stack.getWindowContainerBounds(info.bounds);
         info.displayId = displayId;
@@ -4480,7 +4494,7 @@
     ArrayList<StackInfo> getAllStackInfosLocked() {
         ArrayList<StackInfo> list = new ArrayList<>();
         for (int displayNdx = 0; displayNdx < mActivityDisplays.size(); ++displayNdx) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 list.add(getStackInfo(stack));
@@ -4762,14 +4776,12 @@
     }
 
     ActivityStack findStackBehind(ActivityStack stack) {
-        // TODO(multi-display): We are only looking for stacks on the default display.
-        final ActivityDisplay display = mActivityDisplays.get(DEFAULT_DISPLAY);
-        if (display == null) {
-            return null;
-        }
-        for (int i = display.getChildCount() - 1; i >= 0; i--) {
-            if (display.getChildAt(i) == stack && i > 0) {
-                return display.getChildAt(i - 1);
+        final ActivityDisplay display = getActivityDisplay(stack.mDisplayId);
+        if (display != null) {
+            for (int i = display.getChildCount() - 1; i >= 0; i--) {
+                if (display.getChildAt(i) == stack && i > 0) {
+                    return display.getChildAt(i - 1);
+                }
             }
         }
         throw new IllegalStateException("Failed to find a stack behind stack=" + stack
@@ -4901,7 +4913,7 @@
         final ActivityStack topFocusedStack = getTopDisplayFocusedStack();
         // Traverse all displays.
         for (int i = mActivityDisplays.size() - 1; i >= 0; i--) {
-            final ActivityDisplay display = mActivityDisplays.valueAt(i);
+            final ActivityDisplay display = mActivityDisplays.get(i);
             // Traverse all stacks on a display.
             for (int j = display.getChildCount() - 1; j >= 0; --j) {
                 final ActivityStack stack = display.getChildAt(j);
diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index dcf9344..eb41fe7 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -1469,7 +1469,7 @@
         mService.mUgmInternal.grantUriPermissionFromIntent(mCallingUid, mStartActivity.packageName,
                 mIntent, mStartActivity.getUriPermissionsLocked(), mStartActivity.userId);
         mService.mAm.grantEphemeralAccessLocked(mStartActivity.userId, mIntent,
-                mStartActivity.appInfo.uid, UserHandle.getAppId(mCallingUid));
+                UserHandle.getAppId(mStartActivity.appInfo.uid), UserHandle.getAppId(mCallingUid));
         if (newTask) {
             EventLog.writeEvent(EventLogTags.AM_CREATE_TASK, mStartActivity.userId,
                     mStartActivity.getTask().taskId);
diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index 162f344..6a9c887 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -16,12 +16,12 @@
 
 package com.android.server.am;
 
-import com.android.internal.app.ProcessMap;
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.os.ProcessCpuTracker;
-import com.android.server.RescueParty;
-import com.android.server.Watchdog;
+import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ANR;
+import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
+import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
+import static com.android.server.am.ActivityManagerService.MY_PID;
+import static com.android.server.am.ActivityManagerService.SYSTEM_DEBUGGABLE;
 
 import android.app.ActivityManager;
 import android.app.ActivityOptions;
@@ -45,11 +45,18 @@
 import android.util.ArraySet;
 import android.util.EventLog;
 import android.util.Slog;
-import android.util.StatsLog;
 import android.util.SparseArray;
+import android.util.StatsLog;
 import android.util.TimeUtils;
 import android.util.proto.ProtoOutputStream;
 
+import com.android.internal.app.ProcessMap;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.os.ProcessCpuTracker;
+import com.android.server.RescueParty;
+import com.android.server.Watchdog;
+
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -57,13 +64,6 @@
 import java.util.Collections;
 import java.util.Set;
 
-import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST;
-import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ANR;
-import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
-import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
-import static com.android.server.am.ActivityManagerService.MY_PID;
-import static com.android.server.am.ActivityManagerService.SYSTEM_DEBUGGABLE;
-
 /**
  * Controls error conditions in applications.
  */
@@ -1017,7 +1017,7 @@
         // For background ANRs, don't pass the ProcessCpuTracker to
         // avoid spending 1/2 second collecting stats to rank lastPids.
         File tracesFile = ActivityManagerService.dumpStackTraces(
-                true, firstPids,
+                firstPids,
                 (isSilentANR) ? null : processCpuTracker,
                 (isSilentANR) ? null : lastPids,
                 nativePids);
diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index b36b5d3..bc23316 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -16,15 +16,7 @@
 
 package com.android.server.am;
 
-import android.content.pm.IPackageManager;
-import android.content.pm.PermissionInfo;
-import android.os.Trace;
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Set;
+import static com.android.server.am.ActivityManagerDebugConfig.*;
 
 import android.app.ActivityManager;
 import android.app.AppGlobals;
@@ -37,7 +29,9 @@
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.pm.ActivityInfo;
+import android.content.pm.IPackageManager;
 import android.content.pm.PackageManager;
+import android.content.pm.PermissionInfo;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.Handler;
@@ -47,13 +41,19 @@
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.SystemClock;
+import android.os.Trace;
 import android.os.UserHandle;
 import android.util.EventLog;
 import android.util.Slog;
 import android.util.TimeUtils;
 import android.util.proto.ProtoOutputStream;
 
-import static com.android.server.am.ActivityManagerDebugConfig.*;
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Set;
 
 /**
  * BROADCASTS
@@ -409,10 +409,12 @@
             String resultData, Bundle resultExtras, boolean resultAbort, boolean waitForServices) {
         final int state = r.state;
         final ActivityInfo receiver = r.curReceiver;
+        final long finishTime = SystemClock.uptimeMillis();
         r.state = BroadcastRecord.IDLE;
         if (state == BroadcastRecord.IDLE) {
             Slog.w(TAG, "finishReceiver [" + mQueueName + "] called but state is IDLE");
         }
+        r.duration[r.nextReceiver - 1] = finishTime - r.receiverTime;
         r.receiver = null;
         r.intent.setComponent(null);
         if (r.curApp != null && r.curApp.curReceivers.contains(r)) {
diff --git a/services/core/java/com/android/server/am/BroadcastRecord.java b/services/core/java/com/android/server/am/BroadcastRecord.java
index 7e15947..9b7dc44 100644
--- a/services/core/java/com/android/server/am/BroadcastRecord.java
+++ b/services/core/java/com/android/server/am/BroadcastRecord.java
@@ -18,8 +18,8 @@
 
 import android.app.AppOpsManager;
 import android.app.BroadcastOptions;
-import android.content.IIntentReceiver;
 import android.content.ComponentName;
+import android.content.IIntentReceiver;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ResolveInfo;
@@ -62,6 +62,7 @@
     final BroadcastOptions options; // BroadcastOptions supplied by caller
     final List receivers;   // contains BroadcastFilter and ResolveInfo
     final int[] delivery;   // delivery state of each receiver
+    final long[] duration;   // duration a receiver took to process broadcast
     IIntentReceiver resultTo; // who receives final result if non-null
     long enqueueClockTime;  // the clock time the broadcast was enqueued
     long dispatchTime;      // when dispatch started on this set of receivers
@@ -203,6 +204,7 @@
                 case DELIVERY_TIMEOUT:   pw.print("Timeout"); break;
                 default:                 pw.print("???????"); break;
             }
+            pw.print(" "); TimeUtils.formatDuration(duration[i], pw);
             pw.print(" #"); pw.print(i); pw.print(": ");
             if (o instanceof BroadcastFilter) {
                 pw.println(o);
@@ -239,6 +241,7 @@
         options = _options;
         receivers = _receivers;
         delivery = new int[_receivers != null ? _receivers.size() : 0];
+        duration = new long[delivery.length];
         resultTo = _resultTo;
         resultCode = _resultCode;
         resultData = _resultData;
@@ -274,6 +277,7 @@
         options = from.options;
         receivers = from.receivers;
         delivery = from.delivery;
+        duration = from.duration;
         resultTo = from.resultTo;
         enqueueClockTime = from.enqueueClockTime;
         dispatchTime = from.dispatchTime;
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index 8c552b9..144f18b 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -20,6 +20,7 @@
 import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
 import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
 
+import android.os.Debug;
 import android.util.ArraySet;
 import android.util.DebugUtils;
 import android.util.EventLog;
@@ -207,6 +208,11 @@
     Object adjTarget;           // Debugging: target component impacting oom_adj.
     Runnable crashHandler;      // Optional local handler to be invoked in the process crash.
 
+    // Cache of last retrieve memory info and uptime, to throttle how frequently
+    // apps can requyest it.
+    Debug.MemoryInfo lastMemInfo;
+    long lastMemInfoTime;
+
     // Controller for driving the process state on the window manager side.
     final private WindowProcessController mWindowProcessController;
     // all ServiceRecord running in this process
diff --git a/services/core/java/com/android/server/am/RunningTasks.java b/services/core/java/com/android/server/am/RunningTasks.java
index 7008cee..d878f51 100644
--- a/services/core/java/com/android/server/am/RunningTasks.java
+++ b/services/core/java/com/android/server/am/RunningTasks.java
@@ -16,13 +16,9 @@
 
 package com.android.server.am;
 
-import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
-import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
-
 import android.app.ActivityManager.RunningTaskInfo;
 import android.app.WindowConfiguration.ActivityType;
 import android.app.WindowConfiguration.WindowingMode;
-import android.util.SparseArray;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -45,7 +41,7 @@
     private final ArrayList<TaskRecord> mTmpStackTasks = new ArrayList<>();
 
     void getTasks(int maxNum, List<RunningTaskInfo> list, @ActivityType int ignoreActivityType,
-            @WindowingMode int ignoreWindowingMode, SparseArray<ActivityDisplay> activityDisplays,
+            @WindowingMode int ignoreWindowingMode, ArrayList<ActivityDisplay> activityDisplays,
             int callingUid, boolean allowed) {
         // Return early if there are no tasks to fetch
         if (maxNum <= 0) {
@@ -56,7 +52,7 @@
         mTmpSortedSet.clear();
         final int numDisplays = activityDisplays.size();
         for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {
-            final ActivityDisplay display = activityDisplays.valueAt(displayNdx);
+            final ActivityDisplay display = activityDisplays.get(displayNdx);
             for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = display.getChildAt(stackNdx);
                 mTmpStackTasks.clear();
diff --git a/services/core/java/com/android/server/biometrics/common/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/AuthenticationClient.java
similarity index 88%
rename from services/core/java/com/android/server/biometrics/common/AuthenticationClient.java
rename to services/core/java/com/android/server/biometrics/AuthenticationClient.java
index a9cf963..36e7cba 100644
--- a/services/core/java/com/android/server/biometrics/common/AuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/AuthenticationClient.java
@@ -14,14 +14,13 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
 import android.hardware.biometrics.BiometricConstants;
 import android.hardware.biometrics.BiometricPrompt;
 import android.hardware.biometrics.IBiometricPromptReceiver;
-import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -45,17 +44,16 @@
     public static final int LOCKOUT_TIMED = 1;
     public static final int LOCKOUT_PERMANENT = 2;
 
+    private final BiometricAuthenticator mAuthenticator;
     // Callback mechanism received from the client
-    // (BiometricPrompt -> FingerprintManager -> FingerprintService -> AuthenticationClient)
+    // (BiometricPrompt -> BiometricPromptService -> <Biometric>Service -> AuthenticationClient)
     private IBiometricPromptReceiver mDialogReceiverFromClient;
     private Bundle mBundle;
     private IStatusBarService mStatusBarService;
     private boolean mInLockout;
-    // TODO: BiometricManager, after other biometric modalities are introduced.
-    private final FingerprintManager mFingerprintManager;
     protected boolean mDialogDismissed;
 
-    // Receives events from SystemUI and handles them before forwarding them to FingerprintDialog
+    // Receives events from SystemUI and handles them before forwarding them to BiometricDialog
     protected IBiometricPromptReceiver mDialogReceiver = new IBiometricPromptReceiver.Stub() {
         @Override // binder call
         public void onDialogDismissed(int reason) {
@@ -81,7 +79,7 @@
     public abstract void onStart();
 
     /**
-     * This method is called when a fingerprint is authenticated or authentication is stopped
+     * This method is called when a biometric is authenticated or authentication is stopped
      * (cancelled by the user, or an error such as lockout has occurred).
      */
     public abstract void onStop();
@@ -90,15 +88,15 @@
             BiometricService.DaemonWrapper daemon, long halDeviceId, IBinder token,
             BiometricService.ServiceListener listener, int targetUserId, int groupId, long opId,
             boolean restricted, String owner, Bundle bundle,
-            IBiometricPromptReceiver dialogReceiver, IStatusBarService statusBarService) {
+            IBiometricPromptReceiver dialogReceiver, IStatusBarService statusBarService,
+            BiometricAuthenticator authenticator) {
         super(context, metrics, daemon, halDeviceId, token, listener, targetUserId, groupId,
                 restricted, owner);
         mOpId = opId;
         mBundle = bundle;
         mDialogReceiverFromClient = dialogReceiver;
         mStatusBarService = statusBarService;
-        mFingerprintManager = (FingerprintManager) getContext()
-                .getSystemService(Context.FINGERPRINT_SERVICE);
+        mAuthenticator = authenticator;
         mHandler = new Handler(Looper.getMainLooper());
     }
 
@@ -118,7 +116,7 @@
             try {
                 if (acquiredInfo != BiometricConstants.BIOMETRIC_ACQUIRED_GOOD) {
                     mStatusBarService.onBiometricHelp(
-                            mFingerprintManager.getAcquiredString(acquiredInfo, vendorCode));
+                            mAuthenticator.getAcquiredString(acquiredInfo, vendorCode));
                 }
                 return false; // acquisition continues
             } catch (RemoteException e) {
@@ -139,15 +137,15 @@
     public boolean onError(long deviceId, int error, int vendorCode) {
         if (mDialogDismissed) {
             // If user cancels authentication, the application has already received the
-            // FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED message from onDialogDismissed()
-            // and stopped the fingerprint hardware, so there is no need to send a
-            // FingerprintManager.FINGERPRINT_ERROR_CANCELED message.
+            // ERROR_USER_CANCELED message from onDialogDismissed()
+            // and stopped the biometric hardware, so there is no need to send a
+            // ERROR_CANCELED message.
             return true;
         }
         if (mBundle != null) {
             try {
                 mStatusBarService.onBiometricError(
-                        mFingerprintManager.getErrorString(error, vendorCode));
+                        mAuthenticator.getErrorString(error, vendorCode));
             } catch (RemoteException e) {
                 Slog.e(getLogTag(), "Remote exception when sending error", e);
             }
@@ -160,15 +158,14 @@
             boolean authenticated) {
         boolean result = false;
 
-        // If the fingerprint dialog is showing, notify authentication succeeded
-        // TODO: this goes to BiometricPrompt, split between biometric modalities
+        // If the biometric dialog is showing, notify authentication succeeded
         if (mBundle != null) {
             try {
                 if (authenticated) {
                     mStatusBarService.onBiometricAuthenticated();
                 } else {
                     mStatusBarService.onBiometricHelp(getContext().getResources().getString(
-                            com.android.internal.R.string.fingerprint_not_recognized));
+                            com.android.internal.R.string.biometric_not_recognized));
                 }
             } catch (RemoteException e) {
                 Slog.e(getLogTag(), "Failed to notify Authenticated:", e);
@@ -223,7 +220,7 @@
                     // Send the lockout message to the system dialog
                     if (mBundle != null) {
                         mStatusBarService.onBiometricError(
-                                mFingerprintManager.getErrorString(errorCode, 0 /* vendorCode */));
+                                mAuthenticator.getErrorString(errorCode, 0 /* vendorCode */));
                         mHandler.postDelayed(() -> {
                             try {
                                 listener.onError(getHalDeviceId(), errorCode, 0 /* vendorCode */);
@@ -243,7 +240,7 @@
             if (listener != null) {
                 vibrateSuccess();
             }
-            result |= true; // we have a valid fingerprint, done
+            result |= true; // we have a valid biometric, done
             resetFailedAttempts();
             onStop();
         }
@@ -270,9 +267,10 @@
             // If authenticating with system dialog, show the dialog
             if (mBundle != null) {
                 try {
-                    mStatusBarService.showBiometricDialog(mBundle, mDialogReceiver);
+                    mStatusBarService.showBiometricDialog(mBundle, mDialogReceiver,
+                            mAuthenticator.getType());
                 } catch (RemoteException e) {
-                    Slog.e(getLogTag(), "Unable to show fingerprint dialog", e);
+                    Slog.e(getLogTag(), "Unable to show biometric dialog", e);
                 }
             }
         } catch (RemoteException e) {
@@ -297,7 +295,8 @@
                 Slog.w(getLogTag(), "stopAuthentication failed, result=" + result);
                 return result;
             }
-            if (DEBUG) Slog.w(getLogTag(), "client " + getOwnerString() + " is no longer authenticating");
+            if (DEBUG) Slog.w(getLogTag(), "client " + getOwnerString() +
+                    " is no longer authenticating");
         } catch (RemoteException e) {
             Slog.e(getLogTag(), "stopAuthentication failed", e);
             return ERROR_ESRCH;
@@ -310,7 +309,7 @@
                 try {
                     mStatusBarService.hideBiometricDialog();
                 } catch (RemoteException e) {
-                    Slog.e(getLogTag(), "Unable to hide fingerprint dialog", e);
+                    Slog.e(getLogTag(), "Unable to hide biometric dialog", e);
                 }
             }
         }
diff --git a/services/core/java/com/android/server/biometrics/BiometricPromptService.java b/services/core/java/com/android/server/biometrics/BiometricPromptService.java
new file mode 100644
index 0000000..29eda8b
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/BiometricPromptService.java
@@ -0,0 +1,335 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics;
+
+import static android.Manifest.permission.USE_BIOMETRIC;
+import static android.Manifest.permission.USE_FINGERPRINT;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.biometrics.BiometricAuthenticator;
+import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.IBiometricPromptReceiver;
+import android.hardware.biometrics.IBiometricPromptService;
+import android.hardware.biometrics.IBiometricPromptServiceReceiver;
+import android.hardware.face.FaceManager;
+import android.hardware.face.IFaceService;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.IFingerprintService;
+import android.os.Binder;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.util.Slog;
+
+import com.android.internal.R;
+import com.android.internal.os.SomeArgs;
+import com.android.server.SystemService;
+
+import java.util.ArrayList;
+
+/**
+ * System service that arbitrates the modality for BiometricPrompt to use.
+ */
+public class BiometricPromptService extends SystemService {
+
+    private static final String TAG = "BiometricPromptService";
+
+    /**
+     * No biometric methods or nothing has been enrolled.
+     * Move/expose these in BiometricPrompt if we ever want to allow applications to "blacklist"
+     * modalities when calling authenticate().
+     */
+    private static final int BIOMETRIC_NONE = 0;
+
+    /**
+     * Constant representing fingerprint.
+     */
+    private static final int BIOMETRIC_FINGERPRINT = 1 << 0;
+
+    /**
+     * Constant representing iris.
+     */
+    private static final int BIOMETRIC_IRIS = 1 << 1;
+
+    /**
+     * Constant representing face.
+     */
+    private static final int BIOMETRIC_FACE = 1 << 2;
+
+    private static final int[] FEATURE_ID = {
+            BIOMETRIC_FINGERPRINT,
+            BIOMETRIC_IRIS,
+            BIOMETRIC_FACE
+    };
+
+    private final Handler mHandler;
+    private final boolean mHasFeatureFingerprint;
+    private final boolean mHasFeatureIris;
+    private final boolean mHasFeatureFace;
+
+    private IFingerprintService mFingerprintService;
+    private IFaceService mFaceService;
+
+    // Get and cache the available authenticator (manager) classes. Used since aidl doesn't support
+    // polymorphism :/
+    final ArrayList<Authenticator> mAuthenticators = new ArrayList<>();
+
+    // Cache the current service that's being used. This is the service which
+    // cancelAuthentication() must be forwarded to. This is just a cache, and the actual
+    // check (is caller the current client) is done in the <Biometric>Service.
+    // Since Settings/System (not application) is responsible for changing preference, this
+    // should be safe.
+    private int mCurrentModality;
+
+    private final class Authenticator {
+        int mType;
+        BiometricAuthenticator mAuthenticator;
+
+        Authenticator(int type, BiometricAuthenticator authenticator) {
+            mType = type;
+            mAuthenticator = authenticator;
+        }
+
+        int getType() {
+            return mType;
+        }
+
+        BiometricAuthenticator getAuthenticator() {
+            return mAuthenticator;
+        }
+    }
+
+    /**
+     * This is just a pass-through service that wraps Fingerprint, Iris, Face services. This service
+     * should not carry any state. The reality is we need to keep a tiny amount of state so that
+     * cancelAuthentication() can go to the right place.
+     */
+    private final class BiometricPromptServiceWrapper extends IBiometricPromptService.Stub {
+
+        @Override // Binder call
+        public void authenticate(IBinder token, long sessionId, int userId,
+                IBiometricPromptServiceReceiver receiver, int flags, String opPackageName,
+                Bundle bundle, IBiometricPromptReceiver dialogReceiver) throws RemoteException {
+            // Check the USE_BIOMETRIC permission here. In the BiometricService, check do the
+            // AppOps and foreground check.
+            checkPermission();
+
+            final int callingUid = Binder.getCallingUid();
+            final int callingPid = Binder.getCallingPid();
+            final int callingUserId = UserHandle.getCallingUserId();
+
+            mHandler.post(() -> {
+                mCurrentModality = checkAndGetBiometricModality(receiver);
+
+                try {
+                    // No polymorphism :(
+                    if (mCurrentModality == BIOMETRIC_FINGERPRINT) {
+                        mFingerprintService.authenticateFromService(token, sessionId, userId,
+                                receiver, flags, opPackageName, bundle, dialogReceiver,
+                                callingUid, callingPid, callingUserId);
+                    } else if (mCurrentModality == BIOMETRIC_IRIS) {
+                        Slog.w(TAG, "Unsupported modality");
+                    } else if (mCurrentModality == BIOMETRIC_FACE) {
+                        mFaceService.authenticateFromService(token, sessionId, userId,
+                                receiver, flags, opPackageName, bundle, dialogReceiver,
+                                callingUid, callingPid, callingUserId);
+                    } else {
+                        Slog.w(TAG, "Unsupported modality");
+                    }
+                } catch (RemoteException e) {
+                    Slog.e(TAG, "Unable to start authentication", e);
+                }
+            });
+        }
+
+        @Override // Binder call
+        public void cancelAuthentication(IBinder token, String opPackageName)
+                throws RemoteException {
+            checkPermission();
+
+            final int callingUid = Binder.getCallingUid();
+            final int callingPid = Binder.getCallingPid();
+            final int callingUserId = UserHandle.getCallingUserId();
+
+            mHandler.post(() -> {
+                try {
+                    if (mCurrentModality == BIOMETRIC_FINGERPRINT) {
+                        mFingerprintService.cancelAuthenticationFromService(token, opPackageName,
+                                callingUid, callingPid, callingUserId);
+                    } else if (mCurrentModality == BIOMETRIC_IRIS) {
+                        Slog.w(TAG, "Unsupported modality");
+                    } else if (mCurrentModality == BIOMETRIC_FACE) {
+                        mFaceService.cancelAuthenticationFromService(token, opPackageName,
+                                callingUid, callingPid, callingUserId);
+                    } else {
+                        Slog.w(TAG, "Unsupported modality");
+                    }
+                } catch (RemoteException e) {
+                    Slog.e(TAG, "Unable to cancel authentication");
+                }
+            });
+        }
+    }
+
+    private void checkPermission() {
+        if (getContext().checkCallingPermission(USE_FINGERPRINT)
+                != PackageManager.PERMISSION_GRANTED) {
+            getContext().enforceCallingPermission(USE_BIOMETRIC,
+                    "Must have USE_BIOMETRIC permission");
+        }
+    }
+
+    /**
+     * Initializes the system service.
+     * <p>
+     * Subclasses must define a single argument constructor that accepts the context
+     * and passes it to super.
+     * </p>
+     *
+     * @param context The system server context.
+     */
+    public BiometricPromptService(Context context) {
+        super(context);
+
+        mHandler = new Handler(Looper.getMainLooper());
+
+        final PackageManager pm = context.getPackageManager();
+        mHasFeatureFingerprint = pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
+        mHasFeatureIris = pm.hasSystemFeature(PackageManager.FEATURE_IRIS);
+        mHasFeatureFace = pm.hasSystemFeature(PackageManager.FEATURE_FACE);
+    }
+
+    @Override
+    public void onStart() {
+        // TODO: maybe get these on-demand
+        if (mHasFeatureFingerprint) {
+            mFingerprintService = IFingerprintService.Stub.asInterface(
+                    ServiceManager.getService(Context.FINGERPRINT_SERVICE));
+        }
+        if (mHasFeatureFace) {
+            mFaceService = IFaceService.Stub.asInterface(
+                    ServiceManager.getService(Context.FACE_SERVICE));
+        }
+
+        // Cache the authenticators
+        for (int i = 0; i < FEATURE_ID.length; i++) {
+            if (hasFeature(FEATURE_ID[i])) {
+                Authenticator authenticator =
+                        new Authenticator(FEATURE_ID[i], getAuthenticator(FEATURE_ID[i]));
+                mAuthenticators.add(authenticator);
+            }
+        }
+
+        publishBinderService(Context.BIOMETRIC_PROMPT_SERVICE, new BiometricPromptServiceWrapper());
+    }
+
+    /**
+     * Checks if there are any available biometrics, and returns the modality. This method also
+     * returns errors through the callback (no biometric feature, hardware not detected, no
+     * templates enrolled, etc). This service must not start authentication if errors are sent.
+     */
+    private int checkAndGetBiometricModality(IBiometricPromptServiceReceiver receiver) {
+        int modality = BIOMETRIC_NONE;
+        final String hardwareUnavailable =
+                getContext().getString(R.string.biometric_error_hw_unavailable);
+
+        // No biometric features, send error
+        if (mAuthenticators.isEmpty()) {
+            try {
+                receiver.onError(0 /* deviceId */,
+                        BiometricConstants.BIOMETRIC_ERROR_HW_NOT_PRESENT,
+                        hardwareUnavailable);
+            } catch (RemoteException e) {
+                Slog.e(TAG, "Unable to send error", e);
+            }
+            return BIOMETRIC_NONE;
+        }
+
+        // Find first authenticator that's both detected and enrolled
+        boolean isHardwareDetected = false;
+        boolean hasTemplatesEnrolled = false;
+        for (int i = 0; i < mAuthenticators.size(); i++) {
+            int featureId = mAuthenticators.get(i).getType();
+            BiometricAuthenticator authenticator = mAuthenticators.get(i).getAuthenticator();
+            if (authenticator.isHardwareDetected()) {
+                isHardwareDetected = true;
+                if (authenticator.hasEnrolledTemplates()) {
+                    hasTemplatesEnrolled = true;
+                    modality = featureId;
+                    break;
+                }
+            }
+        }
+
+        // Check error conditions
+        if (!isHardwareDetected) {
+            try {
+                receiver.onError(0 /* deviceId */,
+                        BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE,
+                        hardwareUnavailable);
+            } catch (RemoteException e) {
+                Slog.e(TAG, "Unable to send error", e);
+            }
+            return BIOMETRIC_NONE;
+        }
+        if (!hasTemplatesEnrolled) {
+            try {
+                receiver.onError(0 /* deviceId */,
+                        BiometricConstants.BIOMETRIC_ERROR_NO_BIOMETRICS,
+                        hardwareUnavailable);
+            } catch (RemoteException e) {
+                Slog.e(TAG, "Unable to send error", e);
+            }
+            return BIOMETRIC_NONE;
+        }
+
+        return modality;
+    }
+
+    private BiometricAuthenticator getAuthenticator(int type) {
+        switch (type) {
+            case BIOMETRIC_FINGERPRINT:
+                return (FingerprintManager)
+                        getContext().getSystemService(Context.FINGERPRINT_SERVICE);
+            case BIOMETRIC_IRIS:
+                return null;
+            case BIOMETRIC_FACE:
+                return (FaceManager)
+                        getContext().getSystemService(Context.FACE_SERVICE);
+            default:
+                return null;
+        }
+    }
+
+    private boolean hasFeature(int type) {
+        switch (type) {
+            case BIOMETRIC_FINGERPRINT:
+                return mHasFeatureFingerprint;
+            case BIOMETRIC_IRIS:
+                return mHasFeatureIris;
+            case BIOMETRIC_FACE:
+                return mHasFeatureFace;
+            default:
+                return false;
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/common/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java
similarity index 96%
rename from services/core/java/com/android/server/biometrics/common/BiometricService.java
rename to services/core/java/com/android/server/biometrics/BiometricService.java
index 5603f2f..a181b61 100644
--- a/services/core/java/com/android/server/biometrics/common/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricService.java
@@ -11,10 +11,10 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE;
 
@@ -47,6 +47,7 @@
 import android.os.IRemoteCallback;
 import android.os.PowerManager;
 import android.os.RemoteException;
+import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -96,6 +97,7 @@
     private final LockoutReceiver mLockoutReceiver = new LockoutReceiver();
     private final ArrayList<LockoutResetMonitor> mLockoutMonitors = new ArrayList<>();
 
+    protected final IStatusBarService mStatusBarService;
     protected final Map<Integer, Long> mAuthenticatorIds =
             Collections.synchronizedMap(new HashMap<>());
     protected final ResetFailedAttemptsForUserRunnable mResetFailedAttemptsForCurrentUserRunnable =
@@ -221,10 +223,10 @@
                 IBinder token, ServiceListener listener, int targetUserId, int groupId, long opId,
                 boolean restricted, String owner, Bundle bundle,
                 IBiometricPromptReceiver dialogReceiver,
-                IStatusBarService statusBarService) {
+                IStatusBarService statusBarService, BiometricAuthenticator authenticator) {
             super(context, getMetrics(), daemon, halDeviceId, token, listener,
                     targetUserId, groupId, opId, restricted, owner, bundle, dialogReceiver,
-                    statusBarService);
+                    statusBarService, authenticator);
         }
 
         @Override
@@ -333,8 +335,8 @@
      * Wraps the callback interface from Service -> Manager
      */
     protected interface ServiceListener {
-        void onEnrollResult(BiometricAuthenticator.Identifier identifier,
-                int remaining) throws RemoteException;
+        default void onEnrollResult(BiometricAuthenticator.Identifier identifier,
+                int remaining) throws RemoteException {};
 
         void onAcquired(long deviceId, int acquiredInfo, int vendorCode)
                 throws RemoteException;
@@ -349,11 +351,11 @@
         void onError(long deviceId, int error, int vendorCode)
                 throws RemoteException;
 
-        void onRemoved(BiometricAuthenticator.Identifier identifier,
-                int remaining) throws RemoteException;
+        default void onRemoved(BiometricAuthenticator.Identifier identifier,
+                int remaining) throws RemoteException {};
 
-        void onEnumerated(BiometricAuthenticator.Identifier identifier,
-                int remaining) throws RemoteException;
+        default void onEnumerated(BiometricAuthenticator.Identifier identifier,
+                int remaining) throws RemoteException {};
     }
 
     /**
@@ -524,6 +526,8 @@
     public BiometricService(Context context) {
         super(context);
         mContext = context;
+        mStatusBarService = IStatusBarService.Stub.asInterface(
+                ServiceManager.getService(Context.STATUS_BAR_SERVICE));
         mKeyguardPackage = ComponentName.unflattenFromString(context.getResources().getString(
                 com.android.internal.R.string.config_keyguardComponent)).getPackageName();
         mAppOps = context.getSystemService(AppOpsManager.class);
@@ -688,7 +692,11 @@
         final int callingUid = Binder.getCallingUid();
         final int callingPid = Binder.getCallingPid();
         final int callingUserId = UserHandle.getCallingUserId();
+        authenticateInternal(client, opId, opPackageName, callingUid, callingPid, callingUserId);
+    }
 
+    protected void authenticateInternal(AuthenticationClientImpl client, long opId,
+            String opPackageName, int callingUid, int callingPid, int callingUserId) {
         if (!canUseBiometric(opPackageName, true /* foregroundOnly */, callingUid, callingPid,
                 callingUserId)) {
             if (DEBUG) Slog.v(getTag(), "authenticate(): reject " + opPackageName);
@@ -716,7 +724,11 @@
         final int callingUid = Binder.getCallingUid();
         final int callingPid = Binder.getCallingPid();
         final int callingUserId = UserHandle.getCallingUserId();
+        cancelAuthenticationInternal(token, opPackageName, callingUid, callingPid, callingUserId);
+    }
 
+    protected void cancelAuthenticationInternal(final IBinder token, final String opPackageName,
+            int callingUid, int callingPid, int callingUserId) {
         if (!canUseBiometric(opPackageName, true /* foregroundOnly */, callingUid, callingPid,
                 callingUserId)) {
             if (DEBUG) Slog.v(getTag(), "cancelAuthentication(): reject " + opPackageName);
diff --git a/services/core/java/com/android/server/biometrics/common/BiometricUserState.java b/services/core/java/com/android/server/biometrics/BiometricUserState.java
similarity index 98%
rename from services/core/java/com/android/server/biometrics/common/BiometricUserState.java
rename to services/core/java/com/android/server/biometrics/BiometricUserState.java
index 53eaac0..979ce3a2 100644
--- a/services/core/java/com/android/server/biometrics/common/BiometricUserState.java
+++ b/services/core/java/com/android/server/biometrics/BiometricUserState.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/BiometricUtils.java b/services/core/java/com/android/server/biometrics/BiometricUtils.java
similarity index 96%
rename from services/core/java/com/android/server/biometrics/common/BiometricUtils.java
rename to services/core/java/com/android/server/biometrics/BiometricUtils.java
index 8f076f1..4ff743a 100644
--- a/services/core/java/com/android/server/biometrics/common/BiometricUtils.java
+++ b/services/core/java/com/android/server/biometrics/BiometricUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/ClientMonitor.java b/services/core/java/com/android/server/biometrics/ClientMonitor.java
similarity index 99%
rename from services/core/java/com/android/server/biometrics/common/ClientMonitor.java
rename to services/core/java/com/android/server/biometrics/ClientMonitor.java
index 1486754..d30bed2 100644
--- a/services/core/java/com/android/server/biometrics/common/ClientMonitor.java
+++ b/services/core/java/com/android/server/biometrics/ClientMonitor.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/EnrollClient.java b/services/core/java/com/android/server/biometrics/EnrollClient.java
similarity index 98%
rename from services/core/java/com/android/server/biometrics/common/EnrollClient.java
rename to services/core/java/com/android/server/biometrics/EnrollClient.java
index aee772b..c305eca6 100644
--- a/services/core/java/com/android/server/biometrics/common/EnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/EnrollClient.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/EnumerateClient.java b/services/core/java/com/android/server/biometrics/EnumerateClient.java
similarity index 98%
rename from services/core/java/com/android/server/biometrics/common/EnumerateClient.java
rename to services/core/java/com/android/server/biometrics/EnumerateClient.java
index ee40ee9..b763769 100644
--- a/services/core/java/com/android/server/biometrics/common/EnumerateClient.java
+++ b/services/core/java/com/android/server/biometrics/EnumerateClient.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/Metrics.java b/services/core/java/com/android/server/biometrics/Metrics.java
similarity index 95%
rename from services/core/java/com/android/server/biometrics/common/Metrics.java
rename to services/core/java/com/android/server/biometrics/Metrics.java
index eb1a1f8..02e44e9 100644
--- a/services/core/java/com/android/server/biometrics/common/Metrics.java
+++ b/services/core/java/com/android/server/biometrics/Metrics.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 public interface Metrics {
     /** The log tag */
diff --git a/services/core/java/com/android/server/biometrics/common/RemovalClient.java b/services/core/java/com/android/server/biometrics/RemovalClient.java
similarity index 98%
rename from services/core/java/com/android/server/biometrics/common/RemovalClient.java
rename to services/core/java/com/android/server/biometrics/RemovalClient.java
index 27c42ab..3bf7f04 100644
--- a/services/core/java/com/android/server/biometrics/common/RemovalClient.java
+++ b/services/core/java/com/android/server/biometrics/RemovalClient.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/face/FaceMetrics.java b/services/core/java/com/android/server/biometrics/face/FaceMetrics.java
index 4c907b1..1c5cd5a 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceMetrics.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceMetrics.java
@@ -17,7 +17,7 @@
 package com.android.server.biometrics.face;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.server.biometrics.common.Metrics;
+import com.android.server.biometrics.Metrics;
 
 public class FaceMetrics implements Metrics {
     @Override
diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index f8ccef5..f211e17 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -17,9 +17,9 @@
 package com.android.server.biometrics.face;
 
 import static android.Manifest.permission.INTERACT_ACROSS_USERS;
-import static android.Manifest.permission.MANAGE_FACE;
+import static android.Manifest.permission.MANAGE_BIOMETRIC;
 import static android.Manifest.permission.RESET_FACE_LOCKOUT;
-import static android.Manifest.permission.USE_BIOMETRIC;
+import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;
 
 import android.app.ActivityManager;
 import android.app.AppOpsManager;
@@ -28,10 +28,12 @@
 import android.hardware.biometrics.BiometricAuthenticator;
 import android.hardware.biometrics.BiometricConstants;
 import android.hardware.biometrics.IBiometricPromptReceiver;
+import android.hardware.biometrics.IBiometricPromptServiceReceiver;
 import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
 import android.hardware.biometrics.face.V1_0.IBiometricsFace;
 import android.hardware.biometrics.face.V1_0.IBiometricsFaceClientCallback;
 import android.hardware.face.Face;
+import android.hardware.face.FaceManager;
 import android.hardware.face.IFaceService;
 import android.hardware.face.IFaceServiceReceiver;
 import android.os.Binder;
@@ -40,7 +42,6 @@
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.SELinux;
-import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Slog;
@@ -48,12 +49,11 @@
 
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.statusbar.IStatusBarService;
 import com.android.internal.util.DumpUtils;
 import com.android.server.SystemServerInitThreadPool;
-import com.android.server.biometrics.common.BiometricService;
-import com.android.server.biometrics.common.BiometricUtils;
-import com.android.server.biometrics.common.Metrics;
+import com.android.server.biometrics.BiometricService;
+import com.android.server.biometrics.BiometricUtils;
+import com.android.server.biometrics.Metrics;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -92,13 +92,13 @@
          */
         @Override // Binder call
         public long preEnroll(IBinder token) {
-            checkPermission(MANAGE_FACE);
+            checkPermission(MANAGE_BIOMETRIC);
             return startPreEnroll(token);
         }
 
         @Override // Binder call
         public int postEnroll(IBinder token) {
-            checkPermission(MANAGE_FACE);
+            checkPermission(MANAGE_BIOMETRIC);
             return startPostEnroll(token);
         }
 
@@ -106,7 +106,7 @@
         public void enroll(final IBinder token, final byte[] cryptoToken, final int userId,
                 final IFaceServiceReceiver receiver, final int flags,
                 final String opPackageName) {
-            checkPermission(MANAGE_FACE);
+            checkPermission(MANAGE_BIOMETRIC);
 
             final boolean restricted = isRestricted();
             final EnrollClientImpl client = new EnrollClientImpl(getContext(), mDaemonWrapper,
@@ -118,39 +118,64 @@
 
         @Override // Binder call
         public void cancelEnrollment(final IBinder token) {
-            checkPermission(MANAGE_FACE);
+            checkPermission(MANAGE_BIOMETRIC);
             cancelEnrollmentInternal(token);
         }
 
         @Override // Binder call
         public void authenticate(final IBinder token, final long opId,
                 final IFaceServiceReceiver receiver, final int flags,
-                final String opPackageName, final Bundle bundle,
-                final IBiometricPromptReceiver dialogReceiver) {
+                final String opPackageName) {
+            checkPermission(USE_BIOMETRIC_INTERNAL);
             final boolean restricted = isRestricted();
             final AuthenticationClientImpl client = new AuthenticationClientImpl(getContext(),
                     mDaemonWrapper, mHalDeviceId, token, new ServiceListenerImpl(receiver),
-                    mCurrentUserId, 0 /* groupId */, opId, restricted, opPackageName, bundle,
-                    dialogReceiver, mStatusBarService);
+                    mCurrentUserId, 0 /* groupId */, opId, restricted, opPackageName,
+                    null /* bundle */, null /* dialogReceiver */, mStatusBarService, mFaceManager);
 
             authenticateInternal(client, opId, opPackageName);
         }
 
         @Override // Binder call
+        public void authenticateFromService(IBinder token, long opId, int groupId,
+                IBiometricPromptServiceReceiver receiver, int flags, String opPackageName,
+                Bundle bundle, IBiometricPromptReceiver dialogReceiver,
+                int callingUid, int callingPid, int callingUserId) {
+            checkPermission(USE_BIOMETRIC_INTERNAL);
+            final boolean restricted = true; // BiometricPrompt is always restricted
+            final AuthenticationClientImpl client = new AuthenticationClientImpl(getContext(),
+                    mDaemonWrapper, mHalDeviceId, token,
+                    new BiometricPromptServiceListenerImpl(receiver),
+                    mCurrentUserId, 0 /* groupId */, opId, restricted, opPackageName,
+                    bundle, dialogReceiver, mStatusBarService, mFaceManager);
+            authenticateInternal(client, opId, opPackageName, callingUid, callingPid,
+                    callingUserId);
+        }
+
+        @Override // Binder call
         public void cancelAuthentication(final IBinder token, final String opPackageName) {
+            checkPermission(USE_BIOMETRIC_INTERNAL);
             cancelAuthenticationInternal(token, opPackageName);
         }
 
         @Override // Binder call
+        public void cancelAuthenticationFromService(final IBinder token, final String opPackageName,
+                int callingUid, int callingPid, int callingUserId) {
+            checkPermission(USE_BIOMETRIC_INTERNAL);
+            cancelAuthenticationInternal(token, opPackageName,
+                    callingUid, callingPid, callingUserId);
+        }
+
+        @Override // Binder call
         public void setActiveUser(final int userId) {
-            checkPermission(MANAGE_FACE);
+            checkPermission(MANAGE_BIOMETRIC);
             setActiveUserInternal(userId);
         }
 
         @Override // Binder call
         public void remove(final IBinder token, final int faceId, final int userId,
                 final IFaceServiceReceiver receiver) {
-            checkPermission(MANAGE_FACE);
+            checkPermission(MANAGE_BIOMETRIC);
 
             if (token == null) {
                 Slog.w(TAG, "remove(): token is null");
@@ -168,7 +193,7 @@
         @Override
         public void enumerate(final IBinder token, final int userId,
                 final IFaceServiceReceiver receiver) {
-            checkPermission(MANAGE_FACE);
+            checkPermission(MANAGE_BIOMETRIC);
 
             final boolean restricted = isRestricted();
             final EnumerateClientImpl client = new EnumerateClientImpl(getContext(), mDaemonWrapper,
@@ -180,6 +205,7 @@
         @Override
         public void addLockoutResetCallback(final IBiometricServiceLockoutResetCallback callback)
                 throws RemoteException {
+            checkPermission(USE_BIOMETRIC_INTERNAL);
             FaceService.super.addLockoutResetCallback(callback);
         }
 
@@ -208,6 +234,7 @@
         // TODO: refactor out common code here
         @Override // Binder call
         public boolean isHardwareDetected(long deviceId, String opPackageName) {
+            checkPermission(USE_BIOMETRIC_INTERNAL);
             if (!canUseBiometric(opPackageName, false /* foregroundOnly */,
                     Binder.getCallingUid(), Binder.getCallingPid(),
                     UserHandle.getCallingUserId())) {
@@ -225,7 +252,7 @@
 
         @Override // Binder call
         public void rename(final int faceId, final String name) {
-            checkPermission(MANAGE_FACE);
+            checkPermission(MANAGE_BIOMETRIC);
             if (!isCurrentUserOrProfile(UserHandle.getCallingUserId())) {
                 return;
             }
@@ -240,6 +267,7 @@
 
         @Override // Binder call
         public List<Face> getEnrolledFaces(int userId, String opPackageName) {
+            checkPermission(MANAGE_BIOMETRIC);
             if (!canUseBiometric(opPackageName, false /* foregroundOnly */,
                     Binder.getCallingUid(), Binder.getCallingPid(),
                     UserHandle.getCallingUserId())) {
@@ -251,6 +279,7 @@
 
         @Override // Binder call
         public boolean hasEnrolledFaces(int userId, String opPackageName) {
+            checkPermission(USE_BIOMETRIC_INTERNAL);
             if (!canUseBiometric(opPackageName, false /* foregroundOnly */,
                     Binder.getCallingUid(), Binder.getCallingPid(),
                     UserHandle.getCallingUserId())) {
@@ -283,7 +312,7 @@
 
         @Override // Binder call
         public void resetTimeout(byte[] token) {
-            checkPermission(RESET_FACE_LOCKOUT);
+            checkPermission(MANAGE_BIOMETRIC);
             // TODO: confirm security token when we move timeout management into the HAL layer.
             mHandler.post(mResetFailedAttemptsForCurrentUserRunnable);
         }
@@ -291,6 +320,55 @@
 
     /**
      * Receives callbacks from the ClientMonitor implementations. The results are forwarded to
+     * BiometricPrompt.
+     */
+    private class BiometricPromptServiceListenerImpl implements ServiceListener {
+
+        private IBiometricPromptServiceReceiver mBiometricPromptServiceReceiver;
+
+        public BiometricPromptServiceListenerImpl(IBiometricPromptServiceReceiver receiver) {
+            mBiometricPromptServiceReceiver = receiver;
+        }
+
+        @Override
+        public void onAcquired(long deviceId, int acquiredInfo, int vendorCode)
+                throws RemoteException {
+            /**
+             * Map the acquired codes onto existing {@link BiometricConstants} acquired codes.
+             */
+            if (mBiometricPromptServiceReceiver != null) {
+                mBiometricPromptServiceReceiver.onAcquired(deviceId,
+                        mFaceManager.getMappedAcquiredInfo(acquiredInfo, vendorCode),
+                        mFaceManager.getAcquiredString(acquiredInfo, vendorCode));
+            }
+        }
+
+        @Override
+        public void onAuthenticationSucceeded(long deviceId,
+                BiometricAuthenticator.Identifier biometric, int userId) throws RemoteException {
+            if (mBiometricPromptServiceReceiver != null) {
+                mBiometricPromptServiceReceiver.onAuthenticationSucceeded(deviceId);
+            }
+        }
+
+        @Override
+        public void onAuthenticationFailed(long deviceId) throws RemoteException {
+            if (mBiometricPromptServiceReceiver != null) {
+                mBiometricPromptServiceReceiver.onAuthenticationFailed(deviceId);
+            }
+        }
+
+        @Override
+        public void onError(long deviceId, int error, int vendorCode) throws RemoteException {
+            if (mBiometricPromptServiceReceiver != null) {
+                mBiometricPromptServiceReceiver.onError(deviceId, error,
+                        mFaceManager.getErrorString(error, vendorCode));
+            }
+        }
+    }
+
+    /**
+     * Receives callbacks from the ClientMonitor implementations. The results are forwarded to
      * the FaceManager.
      */
     private class ServiceListenerImpl implements ServiceListener {
@@ -368,9 +446,9 @@
 
     @GuardedBy("this")
     private IBiometricsFace mDaemon;
-
     private long mHalDeviceId;
-    private IStatusBarService mStatusBarService;
+    // Use FaceManager to get strings, so BiometricPrompt interface is cleaner
+    private FaceManager mFaceManager;
 
     /**
      * Receives callbacks from the HAL.
@@ -503,15 +581,14 @@
 
     public FaceService(Context context) {
         super(context);
-        // TODO: can this be retrieved from AuthenticationClient, or BiometricService?
-        mStatusBarService = IStatusBarService.Stub.asInterface(
-                ServiceManager.getService(Context.STATUS_BAR_SERVICE));
     }
 
     @Override
     public void onStart() {
+        super.onStart();
         publishBinderService(Context.FACE_SERVICE, new FaceServiceWrapper());
         SystemServerInitThreadPool.get().submit(this::getFaceDaemon, TAG + ".onStart");
+        mFaceManager = (FaceManager) getContext().getSystemService(Context.FACE_SERVICE);
     }
 
     @Override
@@ -616,12 +693,13 @@
 
     @Override
     protected String getManageBiometricPermission() {
-        return MANAGE_FACE;
+        return MANAGE_BIOMETRIC;
     }
 
     @Override
     protected void checkUseBiometricPermission() {
-        checkPermission(USE_BIOMETRIC);
+        // noop for Face. The permission checks are all done on the incoming binder call.
+        // TODO: Perhaps do the same in FingerprintService
     }
 
     @Override
diff --git a/services/core/java/com/android/server/biometrics/face/FaceUserState.java b/services/core/java/com/android/server/biometrics/face/FaceUserState.java
index c438bfb..65c942d 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceUserState.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceUserState.java
@@ -24,7 +24,7 @@
 import android.util.Xml;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.server.biometrics.common.BiometricUserState;
+import com.android.server.biometrics.BiometricUserState;
 
 import libcore.io.IoUtils;
 
diff --git a/services/core/java/com/android/server/biometrics/face/FaceUtils.java b/services/core/java/com/android/server/biometrics/face/FaceUtils.java
index a7e85e0..63ff548 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceUtils.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceUtils.java
@@ -23,7 +23,7 @@
 import android.util.SparseArray;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.server.biometrics.common.BiometricUtils;
+import com.android.server.biometrics.BiometricUtils;
 
 import java.util.List;
 
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintMetrics.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintMetrics.java
index ba8b3b3..a1115c8 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintMetrics.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintMetrics.java
@@ -17,7 +17,7 @@
 package com.android.server.biometrics.fingerprint;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.server.biometrics.common.Metrics;
+import com.android.server.biometrics.Metrics;
 
 public class FingerprintMetrics implements Metrics {
 
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
index 64b248e..95fb9e3 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
@@ -17,6 +17,7 @@
 package com.android.server.biometrics.fingerprint;
 
 import static android.Manifest.permission.INTERACT_ACROSS_USERS;
+import static android.Manifest.permission.MANAGE_BIOMETRIC;
 import static android.Manifest.permission.MANAGE_FINGERPRINT;
 import static android.Manifest.permission.RESET_FINGERPRINT_LOCKOUT;
 import static android.Manifest.permission.USE_BIOMETRIC;
@@ -30,10 +31,12 @@
 import android.hardware.biometrics.BiometricAuthenticator;
 import android.hardware.biometrics.BiometricConstants;
 import android.hardware.biometrics.IBiometricPromptReceiver;
+import android.hardware.biometrics.IBiometricPromptServiceReceiver;
 import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
 import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;
 import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprintClientCallback;
 import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.IFingerprintClientActiveCallback;
 import android.hardware.fingerprint.IFingerprintService;
 import android.hardware.fingerprint.IFingerprintServiceReceiver;
@@ -42,10 +45,8 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
-import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.SELinux;
-import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Slog;
@@ -53,14 +54,13 @@
 
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.statusbar.IStatusBarService;
 import com.android.internal.util.DumpUtils;
 import com.android.server.SystemServerInitThreadPool;
-import com.android.server.biometrics.common.BiometricService;
-import com.android.server.biometrics.common.BiometricUtils;
-import com.android.server.biometrics.common.ClientMonitor;
-import com.android.server.biometrics.common.EnumerateClient;
-import com.android.server.biometrics.common.Metrics;
+import com.android.server.biometrics.BiometricService;
+import com.android.server.biometrics.BiometricUtils;
+import com.android.server.biometrics.ClientMonitor;
+import com.android.server.biometrics.EnumerateClient;
+import com.android.server.biometrics.Metrics;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -147,23 +147,46 @@
         @Override // Binder call
         public void authenticate(final IBinder token, final long opId, final int groupId,
                 final IFingerprintServiceReceiver receiver, final int flags,
-                final String opPackageName, final Bundle bundle,
-                final IBiometricPromptReceiver dialogReceiver) {
+                final String opPackageName) {
             final boolean restricted = isRestricted();
             final AuthenticationClientImpl client = new AuthenticationClientImpl(getContext(),
                     mDaemonWrapper, mHalDeviceId, token, new ServiceListenerImpl(receiver),
-                    mCurrentUserId, groupId, opId, restricted, opPackageName, bundle,
-                    dialogReceiver, mStatusBarService);
+                    mCurrentUserId, groupId, opId, restricted, opPackageName, null /* bundle */,
+                    null /* dialogReceiver */, mStatusBarService, mFingerprintManager);
 
             authenticateInternal(client, opId, opPackageName);
         }
 
         @Override // Binder call
+        public void authenticateFromService(IBinder token, long opId, int groupId,
+                IBiometricPromptServiceReceiver receiver, int flags, String opPackageName,
+                Bundle bundle, IBiometricPromptReceiver dialogReceiver,
+                int callingUid, int callingPid, int callingUserId) {
+            checkPermission(MANAGE_BIOMETRIC);
+            final boolean restricted = true; // BiometricPrompt is always restricted
+            final AuthenticationClientImpl client = new AuthenticationClientImpl(getContext(),
+                    mDaemonWrapper, mHalDeviceId, token,
+                    new BiometricPromptServiceListenerImpl(receiver),
+                    mCurrentUserId, groupId, opId, restricted, opPackageName, bundle,
+                    dialogReceiver, mStatusBarService, mFingerprintManager);
+            authenticateInternal(client, opId, opPackageName, callingUid, callingPid,
+                    callingUserId);
+        }
+
+        @Override // Binder call
         public void cancelAuthentication(final IBinder token, final String opPackageName) {
             cancelAuthenticationInternal(token, opPackageName);
         }
 
         @Override // Binder call
+        public void cancelAuthenticationFromService(final IBinder token, final String opPackageName,
+                int callingUid, int callingPid, int callingUserId) {
+            checkPermission(MANAGE_BIOMETRIC);
+            cancelAuthenticationInternal(token, opPackageName,
+                    callingUid, callingPid, callingUserId);
+        }
+
+        @Override // Binder call
         public void setActiveUser(final int userId) {
             checkPermission(MANAGE_FINGERPRINT);
             setActiveUserInternal(userId);
@@ -333,6 +356,51 @@
 
     /**
      * Receives callbacks from the ClientMonitor implementations. The results are forwarded to
+     * BiometricPrompt.
+     */
+    private class BiometricPromptServiceListenerImpl implements ServiceListener {
+
+        private IBiometricPromptServiceReceiver mBiometricPromptServiceReceiver;
+
+        public BiometricPromptServiceListenerImpl(IBiometricPromptServiceReceiver receiver) {
+            mBiometricPromptServiceReceiver = receiver;
+        }
+
+        @Override
+        public void onAcquired(long deviceId, int acquiredInfo, int vendorCode)
+                throws RemoteException {
+            if (mBiometricPromptServiceReceiver != null) {
+                mBiometricPromptServiceReceiver.onAcquired(deviceId, acquiredInfo,
+                        mFingerprintManager.getAcquiredString(acquiredInfo, vendorCode));
+            }
+        }
+
+        @Override
+        public void onAuthenticationSucceeded(long deviceId,
+                BiometricAuthenticator.Identifier biometric, int userId) throws RemoteException {
+            if (mBiometricPromptServiceReceiver != null) {
+                mBiometricPromptServiceReceiver.onAuthenticationSucceeded(deviceId);
+            }
+        }
+
+        @Override
+        public void onAuthenticationFailed(long deviceId) throws RemoteException {
+            if (mBiometricPromptServiceReceiver != null) {
+                mBiometricPromptServiceReceiver.onAuthenticationFailed(deviceId);
+            }
+        }
+
+        @Override
+        public void onError(long deviceId, int error, int vendorCode) throws RemoteException {
+            if (mBiometricPromptServiceReceiver != null) {
+                mBiometricPromptServiceReceiver.onError(deviceId, error,
+                        mFingerprintManager.getErrorString(error, vendorCode));
+            }
+        }
+    }
+
+    /**
+     * Receives callbacks from the ClientMonitor implementations. The results are forwarded to
      * the FingerprintManager.
      */
     private class ServiceListenerImpl implements ServiceListener {
@@ -497,9 +565,10 @@
     private IBiometricsFingerprint mDaemon;
 
     private long mHalDeviceId;
-    private IStatusBarService mStatusBarService;
     private IBinder mToken = new Binder(); // used for internal FingerprintService enumeration
     private ArrayList<UserFingerprint> mUnknownFingerprints = new ArrayList<>(); // hw fingerprints
+    // Use FingerprintManager to get strings, so BiometricPrompt interface is cleaner.
+    private FingerprintManager mFingerprintManager;
 
     /**
      * Receives callbacks from the HAL.
@@ -641,9 +710,6 @@
 
     public FingerprintService(Context context) {
         super(context);
-        // TODO: can this be retrieved from AuthenticationClient, or BiometricService?
-        mStatusBarService = IStatusBarService.Stub.asInterface(
-                ServiceManager.getService(Context.STATUS_BAR_SERVICE));
     }
 
     @Override
@@ -651,6 +717,8 @@
         super.onStart();
         publishBinderService(Context.FINGERPRINT_SERVICE, new FingerprintServiceWrapper());
         SystemServerInitThreadPool.get().submit(this::getFingerprintDaemon, TAG + ".onStart");
+        mFingerprintManager = (FingerprintManager)
+                getContext().getSystemService(Context.FINGERPRINT_SERVICE);
     }
 
     @Override
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUserState.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUserState.java
index 9e34ee8..25da978 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUserState.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUserState.java
@@ -24,7 +24,7 @@
 import android.util.Xml;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.server.biometrics.common.BiometricUserState;
+import com.android.server.biometrics.BiometricUserState;
 
 import libcore.io.IoUtils;
 
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUtils.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUtils.java
index 41216e9..a05606b 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUtils.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUtils.java
@@ -23,7 +23,7 @@
 import android.util.SparseArray;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.server.biometrics.common.BiometricUtils;
+import com.android.server.biometrics.BiometricUtils;
 
 import java.util.List;
 
diff --git a/services/core/java/com/android/server/connectivity/DnsManager.java b/services/core/java/com/android/server/connectivity/DnsManager.java
index c0beb37..b8f057d 100644
--- a/services/core/java/com/android/server/connectivity/DnsManager.java
+++ b/services/core/java/com/android/server/connectivity/DnsManager.java
@@ -35,7 +35,6 @@
 import android.net.Network;
 import android.net.NetworkUtils;
 import android.net.Uri;
-import android.net.dns.ResolvUtil;
 import android.os.Binder;
 import android.os.INetworkManagementService;
 import android.os.UserHandle;
@@ -174,15 +173,6 @@
         return new PrivateDnsConfig(useTls);
     }
 
-    public static PrivateDnsConfig tryBlockingResolveOf(Network network, String name) {
-        try {
-            final InetAddress[] ips = ResolvUtil.blockingResolveAllLocally(network, name);
-            return new PrivateDnsConfig(name, ips);
-        } catch (UnknownHostException uhe) {
-            return new PrivateDnsConfig(name, null);
-        }
-    }
-
     public static Uri[] getPrivateDnsSettingsUris() {
         return new Uri[]{
             Settings.Global.getUriFor(PRIVATE_DNS_DEFAULT_MODE),
diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
index 843ba2e..ca9b256 100644
--- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java
+++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
@@ -43,7 +43,6 @@
 import android.net.Uri;
 import android.net.captiveportal.CaptivePortalProbeResult;
 import android.net.captiveportal.CaptivePortalProbeSpec;
-import android.net.dns.ResolvUtil;
 import android.net.metrics.IpConnectivityLog;
 import android.net.metrics.NetworkEvent;
 import android.net.metrics.ValidationProbeEvent;
@@ -326,7 +325,7 @@
         mConnectivityServiceHandler = handler;
         mDependencies = deps;
         mNetworkAgentInfo = networkAgentInfo;
-        mNetwork = deps.getNetwork(networkAgentInfo);
+        mNetwork = deps.getNetwork(networkAgentInfo).getPrivateDnsBypassingCopy();
         mNetId = mNetwork.netId;
         mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
@@ -800,9 +799,7 @@
         private void resolveStrictModeHostname() {
             try {
                 // Do a blocking DNS resolution using the network-assigned nameservers.
-                // Do not set AI_ADDRCONFIG in ai_flags so we get all address families in advance.
-                final InetAddress[] ips = ResolvUtil.blockingResolveAllLocally(
-                        mNetwork, mPrivateDnsProviderHostname, 0 /* aiFlags */);
+                final InetAddress[] ips = mNetwork.getAllByName(mPrivateDnsProviderHostname);
                 mPrivateDnsConfig = new PrivateDnsConfig(mPrivateDnsProviderHostname, ips);
                 validationLog("Strict mode hostname resolved: " + mPrivateDnsConfig);
             } catch (UnknownHostException uhe) {
@@ -860,14 +857,13 @@
     // to complete, regardless of how many IP addresses a host has.
     private static class OneAddressPerFamilyNetwork extends Network {
         public OneAddressPerFamilyNetwork(Network network) {
-            super(network);
+            // Always bypass Private DNS.
+            super(network.getPrivateDnsBypassingCopy());
         }
 
         @Override
         public InetAddress[] getAllByName(String host) throws UnknownHostException {
-            // Always bypass Private DNS.
-            final List<InetAddress> addrs = Arrays.asList(
-                    ResolvUtil.blockingResolveAllLocally(this, host));
+            final List<InetAddress> addrs = Arrays.asList(super.getAllByName(host));
 
             // Ensure the address family of the first address is tried first.
             LinkedHashMap<Class, InetAddress> addressByFamily = new LinkedHashMap<>();
diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/services/core/java/com/android/server/connectivity/PermissionMonitor.java
index e471c7d..7b8571c 100644
--- a/services/core/java/com/android/server/connectivity/PermissionMonitor.java
+++ b/services/core/java/com/android/server/connectivity/PermissionMonitor.java
@@ -24,6 +24,7 @@
 import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
 import static android.content.pm.PackageManager.GET_PERMISSIONS;
 
+import android.annotation.NonNull;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -34,6 +35,7 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.UserInfo;
 import android.net.Uri;
+import android.os.Build;
 import android.os.INetworkManagementService;
 import android.os.RemoteException;
 import android.os.UserHandle;
@@ -155,9 +157,8 @@
     }
 
     @VisibleForTesting
-    boolean isPreinstalledSystemApp(PackageInfo app) {
-        int flags = app.applicationInfo != null ? app.applicationInfo.flags : 0;
-        return (flags & (FLAG_SYSTEM | FLAG_UPDATED_SYSTEM_APP)) != 0;
+    static boolean isVendorApp(@NonNull ApplicationInfo appInfo) {
+        return appInfo.isVendor() || appInfo.isOem() || appInfo.isProduct();
     }
 
     @VisibleForTesting
@@ -177,7 +178,13 @@
     }
 
     private boolean hasRestrictedNetworkPermission(PackageInfo app) {
-        if (isPreinstalledSystemApp(app)) return true;
+        // TODO : remove this check in the future(b/31479477). All apps should just
+        // request the appropriate permission for their use case since android Q.
+        if (app.applicationInfo != null
+                && app.applicationInfo.targetSdkVersion < Build.VERSION_CODES.Q
+                && isVendorApp(app.applicationInfo)) {
+            return true;
+        }
         return hasPermission(app, CONNECTIVITY_INTERNAL)
                 || hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS);
     }
@@ -186,13 +193,8 @@
         // This function defines what it means to hold the permission to use
         // background networks.
         return hasPermission(app, CHANGE_NETWORK_STATE)
-                || hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS)
-                || hasPermission(app, CONNECTIVITY_INTERNAL)
                 || hasPermission(app, NETWORK_STACK)
-                // TODO : remove this check (b/31479477). Not all preinstalled apps should
-                // have access to background networks, they should just request the appropriate
-                // permission for their use case from the list above.
-                || isPreinstalledSystemApp(app);
+                || hasRestrictedNetworkPermission(app);
     }
 
     public boolean hasUseBackgroundNetworksPermission(int uid) {
diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 84bdbba..d16c277 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -1126,7 +1126,9 @@
     }
 
     public String[] getTetheredDhcpRanges() {
-        return mConfig.dhcpRanges;
+        // TODO: this is only valid for the old DHCP server. Latest search suggests it is only used
+        // by WifiP2pServiceImpl to start dnsmasq: remove/deprecate after migrating callers.
+        return mConfig.legacyDhcpRanges;
     }
 
     public String[] getErroredIfaces() {
@@ -1297,13 +1299,17 @@
                 return false;
             }
             // TODO: Randomize DHCPv4 ranges, especially in hotspot mode.
+            // Legacy DHCP server is disabled if passed an empty ranges array
+            final String[] dhcpRanges = cfg.enableLegacyDhcpServer
+                    ? cfg.legacyDhcpRanges
+                    : new String[0];
             try {
                 // TODO: Find a more accurate method name (startDHCPv4()?).
-                mNMService.startTethering(cfg.dhcpRanges);
+                mNMService.startTethering(dhcpRanges);
             } catch (Exception e) {
                 try {
                     mNMService.stopTethering();
-                    mNMService.startTethering(cfg.dhcpRanges);
+                    mNMService.startTethering(dhcpRanges);
                 } catch (Exception ee) {
                     mLog.e(ee);
                     transitionTo(mStartTetheringErrorState);
@@ -1972,7 +1978,7 @@
         final TetherState tetherState = new TetherState(
                 new TetherInterfaceStateMachine(
                     iface, mLooper, interfaceType, mLog, mNMService, mStatsService,
-                    makeControlCallback(iface), mDeps));
+                    makeControlCallback(iface), mConfig.enableLegacyDhcpServer, mDeps));
         mTetherStates.put(iface, tetherState);
         tetherState.stateMachine.start();
     }
diff --git a/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java b/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
index 9e6b659..5accb45 100644
--- a/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
+++ b/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
@@ -16,6 +16,7 @@
 
 package com.android.server.connectivity.tethering;
 
+import static android.net.NetworkUtils.numericToInetAddress;
 import static android.net.util.NetworkConstants.asByte;
 import static android.net.util.NetworkConstants.FF;
 import static android.net.util.NetworkConstants.RFC7421_PREFIX_LENGTH;
@@ -27,8 +28,9 @@
 import android.net.IpPrefix;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
-import android.net.NetworkUtils;
 import android.net.RouteInfo;
+import android.net.dhcp.DhcpServer;
+import android.net.dhcp.DhcpServingParams;
 import android.net.ip.InterfaceController;
 import android.net.ip.RouterAdvertisementDaemon;
 import android.net.ip.RouterAdvertisementDaemon.RaParams;
@@ -49,6 +51,7 @@
 import com.android.internal.util.State;
 import com.android.internal.util.StateMachine;
 
+import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -73,6 +76,13 @@
     private static final String WIFI_HOST_IFACE_ADDR = "192.168.43.1";
     private static final int WIFI_HOST_IFACE_PREFIX_LENGTH = 24;
 
+    // TODO: have PanService use some visible version of this constant
+    private static final String BLUETOOTH_IFACE_ADDR = "192.168.44.1";
+    private static final int BLUETOOTH_DHCP_PREFIX_LENGTH = 24;
+
+    // TODO: have this configurable
+    private static final int DHCP_LEASE_TIME_SECS = 3600;
+
     private final static String TAG = "TetherInterfaceSM";
     private final static boolean DBG = false;
     private final static boolean VDBG = false;
@@ -119,6 +129,7 @@
     private final String mIfaceName;
     private final int mInterfaceType;
     private final LinkProperties mLinkProperties;
+    private final boolean mUsingLegacyDhcp;
 
     private final TetheringDependencies mDeps;
 
@@ -134,12 +145,13 @@
     // Advertisements (otherwise, we do not add them to mLinkProperties at all).
     private LinkProperties mLastIPv6LinkProperties;
     private RouterAdvertisementDaemon mRaDaemon;
+    private DhcpServer mDhcpServer;
     private RaParams mLastRaParams;
 
     public TetherInterfaceStateMachine(
             String ifaceName, Looper looper, int interfaceType, SharedLog log,
             INetworkManagementService nMService, INetworkStatsService statsService,
-            IControlsTethering tetherController,
+            IControlsTethering tetherController, boolean usingLegacyDhcp,
             TetheringDependencies deps) {
         super(ifaceName, looper);
         mLog = log.forSubComponent(ifaceName);
@@ -151,6 +163,7 @@
         mIfaceName = ifaceName;
         mInterfaceType = interfaceType;
         mLinkProperties = new LinkProperties();
+        mUsingLegacyDhcp = usingLegacyDhcp;
         mDeps = deps;
         resetLinkProperties();
         mLastError = ConnectivityManager.TETHER_ERROR_NO_ERROR;
@@ -188,6 +201,53 @@
 
     private boolean startIPv4() { return configureIPv4(true); }
 
+    private boolean startDhcp(Inet4Address addr, int prefixLen) {
+        if (mUsingLegacyDhcp) {
+            return true;
+        }
+
+        final InterfaceParams ifaceParams = mDeps.getInterfaceParams(mIfaceName);
+        if (ifaceParams == null) {
+            Log.e(TAG, "Failed to find interface params for DHCPv4");
+            return false;
+        }
+        final DhcpServingParams params;
+        try {
+            params = new DhcpServingParams.Builder()
+                    .setDefaultRouters(addr)
+                    .setDhcpLeaseTimeSecs(DHCP_LEASE_TIME_SECS)
+                    .setDnsServers(addr)
+                    .setServerAddr(new LinkAddress(addr, prefixLen))
+                    .setMetered(true)
+                    .build();
+            // TODO: also advertise link MTU
+        } catch (DhcpServingParams.InvalidParameterException e) {
+            Log.e(TAG, "Invalid DHCP parameters", e);
+            return false;
+        }
+
+        mDhcpServer = mDeps.makeDhcpServer(getHandler().getLooper(), ifaceParams, params,
+                mLog.forSubComponent("DHCP"));
+        mDhcpServer.start();
+        return true;
+    }
+
+    private void stopDhcp() {
+        if (mDhcpServer != null) {
+            mDhcpServer.stop();
+            mDhcpServer = null;
+        }
+    }
+
+    private boolean configureDhcp(boolean enable, Inet4Address addr, int prefixLen) {
+        if (enable) {
+            return startDhcp(addr, prefixLen);
+        } else {
+            stopDhcp();
+            return true;
+        }
+    }
+
     private void stopIPv4() {
         configureIPv4(false);
         // NOTE: All of configureIPv4() will be refactored out of existence
@@ -210,8 +270,9 @@
             ipAsString = getRandomWifiIPv4Address();
             prefixLen = WIFI_HOST_IFACE_PREFIX_LENGTH;
         } else {
-            // Nothing to do, BT does this elsewhere.
-            return true;
+            // BT configures the interface elsewhere: only start DHCP.
+            final Inet4Address srvAddr = (Inet4Address) numericToInetAddress(BLUETOOTH_IFACE_ADDR);
+            return configureDhcp(enabled, srvAddr, BLUETOOTH_DHCP_PREFIX_LENGTH);
         }
 
         final LinkAddress linkAddr;
@@ -222,7 +283,7 @@
                 return false;
             }
 
-            InetAddress addr = NetworkUtils.numericToInetAddress(ipAsString);
+            InetAddress addr = numericToInetAddress(ipAsString);
             linkAddr = new LinkAddress(addr, prefixLen);
             ifcg.setLinkAddress(linkAddr);
             if (mInterfaceType == ConnectivityManager.TETHERING_WIFI) {
@@ -239,6 +300,10 @@
             }
             ifcg.clearFlag("running");
             mNMService.setInterfaceConfig(mIfaceName, ifcg);
+
+            if (!configureDhcp(enabled, (Inet4Address) addr, prefixLen)) {
+                return false;
+            }
         } catch (Exception e) {
             mLog.e("Error configuring interface " + e);
             return false;
@@ -258,7 +323,7 @@
 
     private String getRandomWifiIPv4Address() {
         try {
-            byte[] bytes = NetworkUtils.numericToInetAddress(WIFI_HOST_IFACE_ADDR).getAddress();
+            byte[] bytes = numericToInetAddress(WIFI_HOST_IFACE_ADDR).getAddress();
             bytes[3] = getRandomSanitizedByte(DOUG_ADAMS, asByte(0), asByte(1), FF);
             return InetAddress.getByAddress(bytes).getHostAddress();
         } catch (Exception e) {
diff --git a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java b/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
index dd9fe05..2b1d919 100644
--- a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
+++ b/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
@@ -21,6 +21,8 @@
 import static android.net.ConnectivityManager.TYPE_MOBILE;
 import static android.net.ConnectivityManager.TYPE_MOBILE_DUN;
 import static android.net.ConnectivityManager.TYPE_MOBILE_HIPRI;
+import static android.provider.Settings.Global.TETHER_ENABLE_LEGACY_DHCP_SERVER;
+
 import static com.android.internal.R.array.config_mobile_hotspot_provision_app;
 import static com.android.internal.R.array.config_tether_bluetooth_regexs;
 import static com.android.internal.R.array.config_tether_dhcp_range;
@@ -30,15 +32,16 @@
 import static com.android.internal.R.bool.config_tether_upstream_automatic;
 import static com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.util.SharedLog;
+import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.R;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -68,12 +71,13 @@
     public static final int DUN_REQUIRED = 1;
     public static final int DUN_UNSPECIFIED = 2;
 
+    // Default ranges used for the legacy DHCP server.
     // USB is  192.168.42.1 and 255.255.255.0
     // Wifi is 192.168.43.1 and 255.255.255.0
     // BT is limited to max default of 5 connections. 192.168.44.1 to 192.168.48.1
     // with 255.255.255.0
     // P2P is 192.168.49.1 and 255.255.255.0
-    private static final String[] DHCP_DEFAULT_RANGE = {
+    private static final String[] LEGACY_DHCP_DEFAULT_RANGE = {
         "192.168.42.2", "192.168.42.254", "192.168.43.2", "192.168.43.254",
         "192.168.44.2", "192.168.44.254", "192.168.45.2", "192.168.45.254",
         "192.168.46.2", "192.168.46.254", "192.168.47.2", "192.168.47.254",
@@ -89,8 +93,9 @@
     public final boolean isDunRequired;
     public final boolean chooseUpstreamAutomatically;
     public final Collection<Integer> preferredUpstreamIfaceTypes;
-    public final String[] dhcpRanges;
+    public final String[] legacyDhcpRanges;
     public final String[] defaultIPv4DNS;
+    public final boolean enableLegacyDhcpServer;
 
     public final String[] provisioningApp;
     public final String provisioningAppNoUi;
@@ -112,8 +117,9 @@
         preferredUpstreamIfaceTypes = getUpstreamIfaceTypes(ctx, dunCheck);
         isDunRequired = preferredUpstreamIfaceTypes.contains(TYPE_MOBILE_DUN);
 
-        dhcpRanges = getDhcpRanges(ctx);
+        legacyDhcpRanges = getLegacyDhcpRanges(ctx);
         defaultIPv4DNS = copy(DEFAULT_IPV4_DNS);
+        enableLegacyDhcpServer = getEnableLegacyDhcpServer(ctx);
 
         provisioningApp = getResourceStringArray(ctx, config_mobile_hotspot_provision_app);
         provisioningAppNoUi = getProvisioningAppNoUi(ctx);
@@ -150,12 +156,15 @@
         dumpStringArray(pw, "preferredUpstreamIfaceTypes",
                 preferredUpstreamNames(preferredUpstreamIfaceTypes));
 
-        dumpStringArray(pw, "dhcpRanges", dhcpRanges);
+        dumpStringArray(pw, "legacyDhcpRanges", legacyDhcpRanges);
         dumpStringArray(pw, "defaultIPv4DNS", defaultIPv4DNS);
 
         dumpStringArray(pw, "provisioningApp", provisioningApp);
         pw.print("provisioningAppNoUi: ");
         pw.println(provisioningAppNoUi);
+
+        pw.print("enableLegacyDhcpServer: ");
+        pw.println(enableLegacyDhcpServer);
     }
 
     public String toString() {
@@ -170,6 +179,7 @@
                 makeString(preferredUpstreamNames(preferredUpstreamIfaceTypes))));
         sj.add(String.format("provisioningApp:%s", makeString(provisioningApp)));
         sj.add(String.format("provisioningAppNoUi:%s", provisioningAppNoUi));
+        sj.add(String.format("enableLegacyDhcpServer:%s", enableLegacyDhcpServer));
         return String.format("TetheringConfiguration{%s}", sj.toString());
     }
 
@@ -276,12 +286,12 @@
         return false;
     }
 
-    private static String[] getDhcpRanges(Context ctx) {
+    private static String[] getLegacyDhcpRanges(Context ctx) {
         final String[] fromResource = getResourceStringArray(ctx, config_tether_dhcp_range);
         if ((fromResource.length > 0) && (fromResource.length % 2 == 0)) {
             return fromResource;
         }
-        return copy(DHCP_DEFAULT_RANGE);
+        return copy(LEGACY_DHCP_DEFAULT_RANGE);
     }
 
     private static String getProvisioningAppNoUi(Context ctx) {
@@ -309,6 +319,13 @@
         }
     }
 
+    private static boolean getEnableLegacyDhcpServer(Context ctx) {
+        // TODO: make the default false (0) and update javadoc in Settings.java
+        final ContentResolver cr = ctx.getContentResolver();
+        final int intVal = Settings.Global.getInt(cr, TETHER_ENABLE_LEGACY_DHCP_SERVER, 1);
+        return intVal != 0;
+    }
+
     private static String[] copy(String[] strarray) {
         return Arrays.copyOf(strarray, strarray.length);
     }
diff --git a/services/core/java/com/android/server/connectivity/tethering/TetheringDependencies.java b/services/core/java/com/android/server/connectivity/tethering/TetheringDependencies.java
index 605ee9c..caa867c 100644
--- a/services/core/java/com/android/server/connectivity/tethering/TetheringDependencies.java
+++ b/services/core/java/com/android/server/connectivity/tethering/TetheringDependencies.java
@@ -19,11 +19,14 @@
 import android.content.Context;
 import android.net.INetd;
 import android.net.NetworkRequest;
+import android.net.dhcp.DhcpServer;
+import android.net.dhcp.DhcpServingParams;
 import android.net.ip.RouterAdvertisementDaemon;
 import android.net.util.InterfaceParams;
 import android.net.util.NetdService;
 import android.os.Handler;
 import android.net.util.SharedLog;
+import android.os.Looper;
 
 import com.android.internal.util.StateMachine;
 
@@ -69,4 +72,9 @@
     public NetworkRequest getDefaultNetworkRequest() {
         return null;
     }
+
+    public DhcpServer makeDhcpServer(Looper looper, InterfaceParams iface, DhcpServingParams params,
+            SharedLog log) {
+        return new DhcpServer(looper, iface, params, log);
+    }
 }
diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java
index 2c9a494..d8d650b 100644
--- a/services/core/java/com/android/server/content/ContentService.java
+++ b/services/core/java/com/android/server/content/ContentService.java
@@ -385,7 +385,7 @@
     @Override
     public void notifyChange(Uri uri, IContentObserver observer,
             boolean observerWantsSelfNotifications, int flags, int userHandle,
-            int targetSdkVersion) {
+            int targetSdkVersion, String callingPackage) {
         if (DEBUG) Slog.d(TAG, "Notifying update of " + uri + " for user " + userHandle
                 + " from observer " + observer + ", flags " + Integer.toHexString(flags));
 
@@ -393,11 +393,11 @@
             throw new NullPointerException("Uri must not be null");
         }
 
-        final int uid = Binder.getCallingUid();
-        final int pid = Binder.getCallingPid();
+        final int callingUid = Binder.getCallingUid();
+        final int callingPid = Binder.getCallingPid();
         final int callingUserHandle = UserHandle.getCallingUserId();
 
-        userHandle = handleIncomingUser(uri, pid, uid,
+        userHandle = handleIncomingUser(uri, callingPid, callingUid,
                 Intent.FLAG_GRANT_WRITE_URI_PERMISSION, true, userHandle);
 
         final String msg = LocalServices.getService(ActivityManagerInternal.class)
@@ -410,7 +410,7 @@
                     // Sigh, we need to quietly let apps targeting older API
                     // levels notify on non-existent providers.
                 } else {
-                    Log.w(TAG, "Ignoring notify for " + uri + " from " + uid + ": " + msg);
+                    Log.w(TAG, "Ignoring notify for " + uri + " from " + callingUid + ": " + msg);
                     return;
                 }
             }
@@ -453,8 +453,10 @@
             if ((flags&ContentResolver.NOTIFY_SYNC_TO_NETWORK) != 0) {
                 SyncManager syncManager = getSyncManager();
                 if (syncManager != null) {
-                    syncManager.scheduleLocalSync(null /* all accounts */, callingUserHandle, uid,
-                            uri.getAuthority(), getSyncExemptionForCaller(uid));
+                    syncManager.scheduleLocalSync(null /* all accounts */, callingUserHandle,
+                            callingUid,
+                            uri.getAuthority(), getSyncExemptionForCaller(callingUid),
+                            callingUid, callingPid, callingPackage);
                 }
             }
 
@@ -477,10 +479,11 @@
     }
 
     public void notifyChange(Uri uri, IContentObserver observer,
-                             boolean observerWantsSelfNotifications, boolean syncToNetwork) {
+            boolean observerWantsSelfNotifications, boolean syncToNetwork,
+            String callingPackage) {
         notifyChange(uri, observer, observerWantsSelfNotifications,
                 syncToNetwork ? ContentResolver.NOTIFY_SYNC_TO_NETWORK : 0,
-                UserHandle.getCallingUserId(), Build.VERSION_CODES.CUR_DEVELOPMENT);
+                UserHandle.getCallingUserId(), Build.VERSION_CODES.CUR_DEVELOPMENT, callingPackage);
     }
 
     /**
@@ -504,14 +507,16 @@
     }
 
     @Override
-    public void requestSync(Account account, String authority, Bundle extras) {
+    public void requestSync(Account account, String authority, Bundle extras,
+            String callingPackage) {
         Bundle.setDefusable(extras, true);
         ContentResolver.validateSyncExtrasBundle(extras);
         int userId = UserHandle.getCallingUserId();
-        int uId = Binder.getCallingUid();
+        final int callingUid = Binder.getCallingUid();
+        final int callingPid = Binder.getCallingPid();
 
-        validateExtras(uId, extras);
-        final int syncExemption = getSyncExemptionAndCleanUpExtrasForCaller(uId, extras);
+        validateExtras(callingUid, extras);
+        final int syncExemption = getSyncExemptionAndCleanUpExtrasForCaller(callingUid, extras);
 
         // This makes it so that future permission checks will be in the context of this
         // process rather than the caller's process. We will restore this before returning.
@@ -519,9 +524,9 @@
         try {
             SyncManager syncManager = getSyncManager();
             if (syncManager != null) {
-                syncManager.scheduleSync(account, userId, uId, authority, extras,
+                syncManager.scheduleSync(account, userId, callingUid, authority, extras,
                         SyncStorageEngine.AuthorityInfo.UNDEFINED,
-                        syncExemption);
+                        syncExemption, callingUid, callingPid, callingPackage);
             }
         } finally {
             restoreCallingIdentity(identityToken);
@@ -538,8 +543,8 @@
      * @param request The request object. Validation of this object is done by its builder.
      */
     @Override
-    public void sync(SyncRequest request) {
-        syncAsUser(request, UserHandle.getCallingUserId());
+    public void sync(SyncRequest request, String callingPackage) {
+        syncAsUser(request, UserHandle.getCallingUserId(), callingPackage);
     }
 
     private long clampPeriod(long period) {
@@ -557,14 +562,15 @@
      * INTERACT_ACROSS_USERS_FULL permission.
      */
     @Override
-    public void syncAsUser(SyncRequest request, int userId) {
+    public void syncAsUser(SyncRequest request, int userId, String callingPackage) {
         enforceCrossUserPermission(userId, "no permission to request sync as user: " + userId);
-        int callerUid = Binder.getCallingUid();
+        final int callingUid = Binder.getCallingUid();
+        final int callingPid = Binder.getCallingPid();
 
         final Bundle extras = request.getBundle();
 
-        validateExtras(callerUid, extras);
-        final int syncExemption = getSyncExemptionAndCleanUpExtrasForCaller(callerUid, extras);
+        validateExtras(callingUid, extras);
+        final int syncExemption = getSyncExemptionAndCleanUpExtrasForCaller(callingUid, extras);
 
         // This makes it so that future permission checks will be in the context of this
         // process rather than the caller's process. We will restore this before returning.
@@ -590,9 +596,9 @@
                         flextime, extras);
             } else {
                 syncManager.scheduleSync(
-                        request.getAccount(), userId, callerUid, request.getProvider(), extras,
+                        request.getAccount(), userId, callingUid, request.getProvider(), extras,
                         SyncStorageEngine.AuthorityInfo.UNDEFINED,
-                        syncExemption);
+                        syncExemption, callingUid, callingPid, callingPackage);
             }
         } finally {
             restoreCallingIdentity(identityToken);
@@ -781,6 +787,7 @@
         enforceCrossUserPermission(userId,
                 "no permission to modify the sync settings for user " + userId);
         final int callingUid = Binder.getCallingUid();
+        final int callingPid = Binder.getCallingPid();
         final int syncExemptionFlag = getSyncExemptionForCaller(callingUid);
 
         long identityToken = clearCallingIdentity();
@@ -788,7 +795,7 @@
             SyncManager syncManager = getSyncManager();
             if (syncManager != null) {
                 syncManager.getSyncStorageEngine().setSyncAutomatically(account, userId,
-                        providerName, sync, syncExemptionFlag, callingUid);
+                        providerName, sync, syncExemptionFlag, callingUid, callingPid);
             }
         } finally {
             restoreCallingIdentity(identityToken);
@@ -916,6 +923,7 @@
 
         syncable = normalizeSyncable(syncable);
         final int callingUid = Binder.getCallingUid();
+        final int callingPid = Binder.getCallingPid();
 
         int userId = UserHandle.getCallingUserId();
         long identityToken = clearCallingIdentity();
@@ -923,7 +931,7 @@
             SyncManager syncManager = getSyncManager();
             if (syncManager != null) {
                 syncManager.getSyncStorageEngine().setIsSyncable(
-                        account, userId, providerName, syncable, callingUid);
+                        account, userId, providerName, syncable, callingUid, callingPid);
             }
         } finally {
             restoreCallingIdentity(identityToken);
@@ -971,13 +979,14 @@
                 "no permission to write the sync settings");
 
         final int callingUid = Binder.getCallingUid();
+        final int callingPid = Binder.getCallingPid();
 
         long identityToken = clearCallingIdentity();
         try {
             SyncManager syncManager = getSyncManager();
             if (syncManager != null) {
                 syncManager.getSyncStorageEngine().setMasterSyncAutomatically(flag, userId,
-                        getSyncExemptionForCaller(callingUid), callingUid);
+                        getSyncExemptionForCaller(callingUid), callingUid, callingPid);
             }
         } finally {
             restoreCallingIdentity(identityToken);
@@ -1305,14 +1314,16 @@
         }
         final ActivityManagerInternal ami =
                 LocalServices.getService(ActivityManagerInternal.class);
-        final int procState = (ami != null)
-                ? ami.getUidProcessState(callingUid)
-                : ActivityManager.PROCESS_STATE_NONEXISTENT;
+        if (ami == null) {
+            return ContentResolver.SYNC_EXEMPTION_NONE;
+        }
+        final int procState = ami.getUidProcessState(callingUid);
+        final boolean isUidActive = ami.isUidActive(callingUid);
 
         if (procState <= ActivityManager.PROCESS_STATE_TOP) {
             return ContentResolver.SYNC_EXEMPTION_PROMOTE_BUCKET_WITH_TEMP;
         }
-        if (procState <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND) {
+        if (procState <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND || isUidActive) {
             return ContentResolver.SYNC_EXEMPTION_PROMOTE_BUCKET;
         }
         return ContentResolver.SYNC_EXEMPTION_NONE;
diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
index f4d20b3..8b93e04 100644
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -584,9 +584,9 @@
         mSyncStorageEngine.setOnSyncRequestListener(new OnSyncRequestListener() {
             @Override
             public void onSyncRequest(SyncStorageEngine.EndPoint info, int reason, Bundle extras,
-                    @SyncExemption int syncExemptionFlag) {
+                    @SyncExemption int syncExemptionFlag, int callingUid, int callingPid) {
                 scheduleSync(info.account, info.userId, reason, info.provider, extras,
-                        AuthorityInfo.UNDEFINED, syncExemptionFlag);
+                        AuthorityInfo.UNDEFINED, syncExemptionFlag, callingUid, callingPid, null);
             }
         });
 
@@ -619,7 +619,8 @@
                     scheduleSync(null, UserHandle.USER_ALL,
                             SyncOperation.REASON_SERVICE_CHANGED,
                             type.authority, null, AuthorityInfo.UNDEFINED,
-                            ContentResolver.SYNC_EXEMPTION_NONE);
+                            ContentResolver.SYNC_EXEMPTION_NONE,
+                            Process.myUid(), -1, null);
                 }
             }
         }, mSyncHandler);
@@ -666,7 +667,8 @@
                 scheduleSync(account, UserHandle.getUserId(uid),
                         SyncOperation.REASON_ACCOUNTS_UPDATED,
                         null, null, AuthorityInfo.SYNCABLE_NO_ACCOUNT_ACCESS,
-                        ContentResolver.SYNC_EXEMPTION_NONE);
+                        ContentResolver.SYNC_EXEMPTION_NONE,
+                        Process.myUid(), -2, null);
             }
         });
 
@@ -893,9 +895,11 @@
      */
     public void scheduleSync(Account requestedAccount, int userId, int reason,
             String requestedAuthority, Bundle extras, int targetSyncState,
-            @SyncExemption int syncExemptionFlag) {
+            @SyncExemption int syncExemptionFlag, int callingUid, int callingPid,
+            String callingPackage) {
         scheduleSync(requestedAccount, userId, reason, requestedAuthority, extras, targetSyncState,
-                0 /* min delay */, true /* checkIfAccountReady */, syncExemptionFlag);
+                0 /* min delay */, true /* checkIfAccountReady */, syncExemptionFlag,
+                callingUid, callingPid, callingPackage);
     }
 
     /**
@@ -904,18 +908,21 @@
     private void scheduleSync(Account requestedAccount, int userId, int reason,
             String requestedAuthority, Bundle extras, int targetSyncState,
             final long minDelayMillis, boolean checkIfAccountReady,
-            @SyncExemption int syncExemptionFlag) {
-        final boolean isLoggable = Log.isLoggable(TAG, Log.VERBOSE);
+            @SyncExemption int syncExemptionFlag,
+            int callingUid, int callingPid, String callingPackage) {
         if (extras == null) {
             extras = new Bundle();
         }
-        if (isLoggable) {
-            Log.d(TAG, "one-time sync for: " + requestedAccount + " " + extras.toString() + " "
-                    + requestedAuthority
-                    + " reason=" + reason
-                    + " checkIfAccountReady=" + checkIfAccountReady
-                    + " syncExemptionFlag=" + syncExemptionFlag);
-        }
+        extras.size(); // Force unpacel.
+        mLogger.log("scheduleSync: account=", requestedAccount,
+                " u", userId,
+                " authority=", requestedAuthority,
+                " reason=", reason,
+                " extras=", extras,
+                " cuid=", callingUid, " cpid=", callingPid, " cpkg=", callingPackage,
+                " mdm=", minDelayMillis,
+                " ciar=", checkIfAccountReady,
+                " sef=", syncExemptionFlag);
 
         AccountAndUser[] accounts = null;
         if (requestedAccount != null) {
@@ -934,9 +941,7 @@
         }
 
         if (ArrayUtils.isEmpty(accounts)) {
-            if (isLoggable) {
-                Slog.v(TAG, "scheduleSync: no accounts configured, dropping");
-            }
+            mLogger.log("scheduleSync: no accounts configured, dropping");
             return;
         }
 
@@ -1007,10 +1012,8 @@
                 final int owningUid = syncAdapterInfo.uid;
 
                 if (isSyncable == AuthorityInfo.SYNCABLE_NO_ACCOUNT_ACCESS) {
-                    if (isLoggable) {
-                        Slog.v(TAG, "    Not scheduling sync operation: "
+                    mLogger.log("scheduleSync: Not scheduling sync operation: "
                                 + "isSyncable == SYNCABLE_NO_ACCOUNT_ACCESS");
-                    }
                     Bundle finalExtras = new Bundle(extras);
                     String packageName = syncAdapterInfo.componentName.getPackageName();
                     // If the app did not run and has no account access, done
@@ -1025,7 +1028,8 @@
                                     scheduleSync(account.account, userId, reason, authority,
                                             finalExtras, targetSyncState, minDelayMillis,
                                             true /* checkIfAccountReady */,
-                                            syncExemptionFlag);
+                                            syncExemptionFlag, callingUid, callingPid,
+                                            callingPackage);
                                 }
                             }
                         ));
@@ -1037,7 +1041,7 @@
                 if (!checkIfAccountReady && isSyncable < 0 && isAlwaysSyncable) {
                     mSyncStorageEngine.setIsSyncable(
                             account.account, account.userId, authority, AuthorityInfo.SYNCABLE,
-                            SyncLogger.CALLING_UID_SELF);
+                            callingUid, callingPid);
                     isSyncable = AuthorityInfo.SYNCABLE;
                 }
 
@@ -1056,10 +1060,8 @@
                                 && mSyncStorageEngine.getSyncAutomatically(account.account,
                                 account.userId, authority));
                 if (!syncAllowed) {
-                    if (isLoggable) {
-                        Log.d(TAG, "scheduleSync: sync of " + account + ", " + authority
-                                + " is not allowed, dropping request");
-                    }
+                    mLogger.log("scheduleSync: sync of ", account, " ", authority,
+                            " is not allowed, dropping request");
                     continue;
                 }
                 SyncStorageEngine.EndPoint info =
@@ -1077,21 +1079,16 @@
                         sendOnUnsyncableAccount(mContext, syncAdapterInfo, account.userId,
                                 () -> scheduleSync(account.account, account.userId, reason,
                                         authority, finalExtras, targetSyncState, minDelayMillis,
-                                        false, syncExemptionFlag));
+                                        false, syncExemptionFlag, callingUid, callingPid,
+                                        callingPackage));
                     } else {
                         // Initialisation sync.
                         Bundle newExtras = new Bundle();
                         newExtras.putBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE, true);
-                        if (isLoggable) {
-                            Slog.v(TAG, "schedule initialisation Sync:"
-                                    + ", delay until " + delayUntil
-                                    + ", run by " + 0
-                                    + ", flexMillis " + 0
-                                    + ", source " + source
-                                    + ", account " + account
-                                    + ", authority " + authority
-                                    + ", extras " + newExtras);
-                        }
+
+                        mLogger.log("scheduleSync: schedule initialisation sync ",
+                                account, " ", authority);
+
                         postScheduleSyncMessage(
                                 new SyncOperation(account.account, account.userId,
                                         owningUid, owningPackage, reason, source,
@@ -1102,20 +1099,17 @@
                     }
                 } else if (targetSyncState == AuthorityInfo.UNDEFINED
                         || targetSyncState == isSyncable) {
-                    if (isLoggable) {
-                        Slog.v(TAG, "scheduleSync:"
-                                + " delay until " + delayUntil
-                                + ", source " + source
-                                + ", account " + account
-                                + ", authority " + authority
-                                + ", extras " + extras);
-                    }
+                    mLogger.log("scheduleSync: scheduling sync ",
+                            account, " ", authority);
                     postScheduleSyncMessage(
                             new SyncOperation(account.account, account.userId,
                                     owningUid, owningPackage, reason, source,
                                     authority, extras, allowParallelSyncs, syncExemptionFlag),
                             minDelayMillis
                     );
+                } else {
+                    mLogger.log("scheduleSync: not handling ",
+                            account, " ", authority);
                 }
             }
         }
@@ -1227,12 +1221,13 @@
      * ms to batch syncs.
      */
     public void scheduleLocalSync(Account account, int userId, int reason, String authority,
-            @SyncExemption int syncExemptionFlag) {
+            @SyncExemption int syncExemptionFlag,
+            int callingUid, int callingPid, String callingPackage) {
         final Bundle extras = new Bundle();
         extras.putBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD, true);
         scheduleSync(account, userId, reason, authority, extras,
                 AuthorityInfo.UNDEFINED, LOCAL_SYNC_DELAY, true /* checkIfAccountReady */,
-                syncExemptionFlag);
+                syncExemptionFlag, callingUid, callingPid, callingPackage);
     }
 
     public SyncAdapterType[] getSyncAdapterTypes(int userId) {
@@ -1769,7 +1764,8 @@
                 mContext.getOpPackageName());
         for (Account account : accounts) {
             scheduleSync(account, userId, SyncOperation.REASON_USER_START, null, null,
-                    AuthorityInfo.NOT_INITIALIZED, ContentResolver.SYNC_EXEMPTION_NONE);
+                    AuthorityInfo.NOT_INITIALIZED, ContentResolver.SYNC_EXEMPTION_NONE,
+                    Process.myUid(), -3, null);
         }
     }
 
@@ -3272,7 +3268,7 @@
                 scheduleSync(syncTargets.account, syncTargets.userId,
                         SyncOperation.REASON_ACCOUNTS_UPDATED, syncTargets.provider,
                         null, AuthorityInfo.NOT_INITIALIZED,
-                        ContentResolver.SYNC_EXEMPTION_NONE);
+                        ContentResolver.SYNC_EXEMPTION_NONE, Process.myUid(), -4, null);
             }
         }
 
diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java
index 391e3b0..bfd1791 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -357,7 +357,7 @@
 
         /** Called when a sync is needed on an account(s) due to some change in state. */
         public void onSyncRequest(EndPoint info, int reason, Bundle extras,
-                @SyncExemption int syncExemptionFlag);
+                @SyncExemption int syncExemptionFlag, int callingUid, int callingPid);
     }
 
     interface PeriodicSyncAddedListener {
@@ -669,7 +669,7 @@
     }
 
     public void setSyncAutomatically(Account account, int userId, String providerName,
-            boolean sync, @SyncExemption int syncExemptionFlag, int callingUid) {
+            boolean sync, @SyncExemption int syncExemptionFlag, int callingUid, int callingPid) {
         if (Log.isLoggable(TAG, Log.VERBOSE)) {
             Slog.d(TAG, "setSyncAutomatically: " + /* account + */" provider " + providerName
                     + ", user " + userId + " -> " + sync);
@@ -678,7 +678,9 @@
                 " user=", userId,
                 " authority=", providerName,
                 " value=", Boolean.toString(sync),
-                " callingUid=", callingUid);
+                " cuid=", callingUid,
+                " cpid=", callingPid
+        );
         synchronized (mAuthorities) {
             AuthorityInfo authority =
                     getOrCreateAuthorityLocked(
@@ -704,7 +706,7 @@
         if (sync) {
             requestSync(account, userId, SyncOperation.REASON_SYNC_AUTO, providerName,
                     new Bundle(),
-                    syncExemptionFlag);
+                    syncExemptionFlag, callingUid, callingPid);
         }
         reportChange(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS);
         queueBackup();
@@ -736,9 +738,9 @@
     }
 
     public void setIsSyncable(Account account, int userId, String providerName, int syncable,
-            int callingUid) {
+            int callingUid, int callingPid) {
         setSyncableStateForEndPoint(new EndPoint(account, providerName, userId), syncable,
-                callingUid);
+                callingUid, callingPid);
     }
 
     /**
@@ -747,10 +749,12 @@
      * @param target target to set value for.
      * @param syncable 0 indicates unsyncable, <0 unknown, >0 is active/syncable.
      */
-    private void setSyncableStateForEndPoint(EndPoint target, int syncable, int callingUid) {
+    private void setSyncableStateForEndPoint(EndPoint target, int syncable,
+            int callingUid, int callingPid) {
         AuthorityInfo aInfo;
         mLogger.log("Set syncable ", target, " value=", Integer.toString(syncable),
-                " callingUid=", callingUid);
+                " cuid=", callingUid,
+                " cpid=", callingPid);
         synchronized (mAuthorities) {
             aInfo = getOrCreateAuthorityLocked(target, -1, false);
             if (syncable < AuthorityInfo.NOT_INITIALIZED) {
@@ -770,7 +774,7 @@
         }
         if (syncable == AuthorityInfo.SYNCABLE) {
             requestSync(aInfo, SyncOperation.REASON_IS_SYNCABLE, new Bundle(),
-                    ContentResolver.SYNC_EXEMPTION_NONE);
+                    ContentResolver.SYNC_EXEMPTION_NONE, callingUid, callingPid);
         }
         reportChange(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS);
     }
@@ -932,9 +936,10 @@
     }
 
     public void setMasterSyncAutomatically(boolean flag, int userId,
-            @SyncExemption int syncExemptionFlag, int callingUid) {
+            @SyncExemption int syncExemptionFlag, int callingUid, int callingPid) {
         mLogger.log("Set master enabled=", flag, " user=", userId,
-                " caller=" + callingUid);
+                " cuid=", callingUid,
+                " cpid=", callingPid);
         synchronized (mAuthorities) {
             Boolean auto = mMasterSyncAutomatically.get(userId);
             if (auto != null && auto.equals(flag)) {
@@ -946,7 +951,7 @@
         if (flag) {
             requestSync(null, userId, SyncOperation.REASON_MASTER_SYNC_AUTO, null,
                     new Bundle(),
-                    syncExemptionFlag);
+                    syncExemptionFlag, callingUid, callingPid);
         }
         reportChange(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS);
         mContext.sendBroadcast(ContentResolver.ACTION_SYNC_CONN_STATUS_CHANGED);
@@ -2064,11 +2069,11 @@
     }
 
     private void requestSync(AuthorityInfo authorityInfo, int reason, Bundle extras,
-            @SyncExemption int syncExemptionFlag) {
+            @SyncExemption int syncExemptionFlag, int callingUid, int callingPid) {
         if (android.os.Process.myUid() == android.os.Process.SYSTEM_UID
                 && mSyncRequestListener != null) {
             mSyncRequestListener.onSyncRequest(authorityInfo.target, reason, extras,
-                    syncExemptionFlag);
+                    syncExemptionFlag, callingUid, callingPid);
         } else {
             SyncRequest.Builder req =
                     new SyncRequest.Builder()
@@ -2080,7 +2085,7 @@
     }
 
     private void requestSync(Account account, int userId, int reason, String authority,
-            Bundle extras, @SyncExemption int syncExemptionFlag) {
+            Bundle extras, @SyncExemption int syncExemptionFlag, int callingUid, int callingPid) {
         // If this is happening in the system process, then call the syncrequest listener
         // to make a request back to the SyncManager directly.
         // If this is probably a test instance, then call back through the ContentResolver
@@ -2089,7 +2094,7 @@
                 && mSyncRequestListener != null) {
             mSyncRequestListener.onSyncRequest(
                     new EndPoint(account, authority, userId),
-                    reason, extras, syncExemptionFlag);
+                    reason, extras, syncExemptionFlag, callingUid, callingPid);
         } else {
             ContentResolver.requestSync(account, authority, extras);
         }
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java
new file mode 100644
index 0000000..b57356f
--- /dev/null
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.inputmethod;
+
+import android.content.ComponentName;
+
+import com.android.internal.view.IInputContext;
+import com.android.internal.view.IInputMethodClient;
+
+/**
+ * Input method manager local system service interface.
+ */
+public abstract class InputMethodManagerInternal {
+    /**
+     * Called by the window manager service when a client process is being attached to the window
+     * manager service.
+     * @param client {@link android.os.Binder} proxy that is associated with the singleton instance
+     *               of {@link android.view.inputmethod.InputMethodManager} that runs on the client
+     *               process
+     * @param inputContext communication channel for the dummy
+     *                     {@link android.view.inputmethod.InputConnection}
+     * @param uid UID of the client process
+     * @param pid PID of the client process
+     */
+    public abstract void addClient(IInputMethodClient client, IInputContext inputContext, int uid,
+            int pid);
+
+    /**
+     * Called by the window manager service when a client process is being attached to the window
+     * manager service.
+     * @param client {@link android.os.Binder} proxy that is associated with the singleton instance
+     *               of {@link android.view.inputmethod.InputMethodManager} that runs on the client
+     *               process
+     */
+    public abstract void removeClient(IInputMethodClient client);
+
+    /**
+     * Called by the power manager to tell the input method manager whether it
+     * should start watching for wake events.
+     */
+    public abstract void setInteractive(boolean interactive);
+
+    /**
+     * Hides the current input method, if visible.
+     */
+    public abstract void hideCurrentInputMethod();
+
+    /**
+     * Switches to VR InputMethod defined in the packageName of {@param componentName}.
+     */
+    public abstract void startVrInputMethodNoCheck(ComponentName componentName);
+
+    /**
+     * Fake implementation of {@link InputMethodManagerInternal}.  All the methods do nothing.
+     */
+    public static final InputMethodManagerInternal NOP =
+            new InputMethodManagerInternal() {
+                @Override
+                public void addClient(IInputMethodClient client, IInputContext inputContext,
+                        int uid, int pid) {
+                }
+
+                @Override
+                public void removeClient(IInputMethodClient client) {
+                }
+
+                @Override
+                public void setInteractive(boolean interactive) {
+                }
+
+                @Override
+                public void hideCurrentInputMethod() {
+                }
+
+                @Override
+                public void startVrInputMethodNoCheck(ComponentName componentName) {
+                }
+            };
+}
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index 4edd48f..a54811b 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -69,6 +69,7 @@
 import android.provider.Settings;
 import android.provider.Telephony.Carriers;
 import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
 import android.telephony.TelephonyManager;
@@ -2507,13 +2508,20 @@
         if (apn == null) {
             return APN_INVALID;
         }
-
+        TelephonyManager phone = (TelephonyManager)
+                mContext.getSystemService(Context.TELEPHONY_SERVICE);
+        // Carrier configuration may override framework roaming state, we need to use the actual
+        // modem roaming state instead of the framework roaming state.
+        boolean isDataRoamingFromRegistration = phone.getServiceState().
+                getDataRoamingFromRegistration();
+        String projection = isDataRoamingFromRegistration ? Carriers.ROAMING_PROTOCOL :
+                Carriers.PROTOCOL;
         String selection = String.format("current = 1 and apn = '%s' and carrier_enabled = 1", apn);
         Cursor cursor = null;
         try {
             cursor = mContext.getContentResolver().query(
                     Carriers.CONTENT_URI,
-                    new String[]{Carriers.PROTOCOL},
+                    new String[]{projection},
                     selection,
                     null,
                     Carriers.DEFAULT_SORT_ORDER);
diff --git a/services/core/java/com/android/server/notification/ConditionProviders.java b/services/core/java/com/android/server/notification/ConditionProviders.java
index 18f4bc7..41f2cc5 100644
--- a/services/core/java/com/android/server/notification/ConditionProviders.java
+++ b/services/core/java/com/android/server/notification/ConditionProviders.java
@@ -279,11 +279,13 @@
 
     public void ensureRecordExists(ComponentName component, Uri conditionId,
             IConditionProvider provider) {
-        // constructed by convention, make sure the record exists...
-        final ConditionRecord r = getRecordLocked(conditionId, component, true /*create*/);
-        if (r.info == null) {
-            // ... and is associated with the in-process service
-            r.info = checkServiceTokenLocked(provider);
+        synchronized (mMutex) {
+            // constructed by convention, make sure the record exists...
+            final ConditionRecord r = getRecordLocked(conditionId, component, true /*create*/);
+            if (r.info == null) {
+                // ... and is associated with the in-process service
+                r.info = checkServiceTokenLocked(provider);
+            }
         }
     }
 
diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java
index efc18ad..340ae0a 100644
--- a/services/core/java/com/android/server/notification/ManagedServices.java
+++ b/services/core/java/com/android/server/notification/ManagedServices.java
@@ -216,12 +216,14 @@
         }
 
         pw.println("    Live " + getCaption() + "s (" + mServices.size() + "):");
-        for (ManagedServiceInfo info : mServices) {
-            if (filter != null && !filter.matches(info.component)) continue;
-            pw.println("      " + info.component
-                    + " (user " + info.userid + "): " + info.service
-                    + (info.isSystem?" SYSTEM":"")
-                    + (info.isGuest(this)?" GUEST":""));
+        synchronized (mMutex) {
+            for (ManagedServiceInfo info : mServices) {
+                if (filter != null && !filter.matches(info.component)) continue;
+                pw.println("      " + info.component
+                        + " (user " + info.userid + "): " + info.service
+                        + (info.isSystem ? " SYSTEM" : "")
+                        + (info.isGuest(this) ? " GUEST" : ""));
+            }
         }
 
         pw.println("    Snoozed " + getCaption() + "s (" +
@@ -260,9 +262,11 @@
             cmpt.writeToProto(proto, ManagedServicesProto.ENABLED);
         }
 
-        for (ManagedServiceInfo info : mServices) {
-            if (filter != null && !filter.matches(info.component)) continue;
-            info.writeToProto(proto, ManagedServicesProto.LIVE_SERVICES, this);
+        synchronized (mMutex) {
+            for (ManagedServiceInfo info : mServices) {
+                if (filter != null && !filter.matches(info.component)) continue;
+                info.writeToProto(proto, ManagedServicesProto.LIVE_SERVICES, this);
+            }
         }
 
         for (ComponentName name : mSnoozingForCurrentProfiles) {
@@ -631,11 +635,13 @@
 
     public boolean isSameUser(IInterface service, int userId) {
         checkNotNull(service);
-        ManagedServiceInfo info = getServiceFromTokenLocked(service);
-        if (info != null) {
-            return info.isSameUser(userId);
+        synchronized (mMutex) {
+            ManagedServiceInfo info = getServiceFromTokenLocked(service);
+            if (info != null) {
+                return info.isSameUser(userId);
+            }
+            return false;
         }
-        return false;
     }
 
     public void unregisterService(IInterface service, int userid) {
diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java
index 72f11f7..a5c083e 100644
--- a/services/core/java/com/android/server/pm/Installer.java
+++ b/services/core/java/com/android/server/pm/Installer.java
@@ -71,14 +71,18 @@
     /** Indicates that dexopt should generate an app image */
     public static final int DEXOPT_GENERATE_APP_IMAGE = 1 << 12;
 
-    // NOTE: keep in sync with installd
-    public static final int FLAG_CLEAR_CACHE_ONLY = 1 << 8;
-    public static final int FLAG_CLEAR_CODE_CACHE_ONLY = 1 << 9;
-    public static final int FLAG_USE_QUOTA = 1 << 12;
-    public static final int FLAG_FREE_CACHE_V2 = 1 << 13;
-    public static final int FLAG_FREE_CACHE_V2_DEFY_QUOTA = 1 << 14;
-    public static final int FLAG_FREE_CACHE_NOOP = 1 << 15;
-    public static final int FLAG_FORCE = 1 << 16;
+    public static final int FLAG_STORAGE_DE = IInstalld.FLAG_STORAGE_DE;
+    public static final int FLAG_STORAGE_CE = IInstalld.FLAG_STORAGE_CE;
+
+    public static final int FLAG_CLEAR_CACHE_ONLY = IInstalld.FLAG_CLEAR_CACHE_ONLY;
+    public static final int FLAG_CLEAR_CODE_CACHE_ONLY = IInstalld.FLAG_CLEAR_CODE_CACHE_ONLY;
+
+    public static final int FLAG_FREE_CACHE_V2 = IInstalld.FLAG_FREE_CACHE_V2;
+    public static final int FLAG_FREE_CACHE_V2_DEFY_QUOTA = IInstalld.FLAG_FREE_CACHE_V2_DEFY_QUOTA;
+    public static final int FLAG_FREE_CACHE_NOOP = IInstalld.FLAG_FREE_CACHE_NOOP;
+
+    public static final int FLAG_USE_QUOTA = IInstalld.FLAG_USE_QUOTA;
+    public static final int FLAG_FORCE = IInstalld.FLAG_FORCE;
 
     private final boolean mIsolated;
 
diff --git a/services/core/java/com/android/server/pm/InstantAppResolver.java b/services/core/java/com/android/server/pm/InstantAppResolver.java
index 9bd3924..30b2c9d 100644
--- a/services/core/java/com/android/server/pm/InstantAppResolver.java
+++ b/services/core/java/com/android/server/pm/InstantAppResolver.java
@@ -132,7 +132,7 @@
         try {
             final List<InstantAppResolveInfo> instantAppResolveInfoList =
                     connection.getInstantAppResolveInfoList(sanitizedIntent,
-                            requestObj.digest.getDigestPrefixSecure(), token);
+                            requestObj.digest.getDigestPrefixSecure(), requestObj.userId, token);
             if (instantAppResolveInfoList != null && instantAppResolveInfoList.size() > 0) {
                 resolveInfo = InstantAppResolver.filterInstantAppIntent(
                         instantAppResolveInfoList, origIntent, requestObj.resolvedType,
@@ -224,8 +224,8 @@
         };
         try {
             connection.getInstantAppIntentFilterList(sanitizedIntent,
-                    requestObj.digest.getDigestPrefixSecure(), token, callback, callbackHandler,
-                    startTime);
+                    requestObj.digest.getDigestPrefixSecure(), requestObj.userId, token, callback,
+                    callbackHandler, startTime);
         } catch (ConnectionException e) {
             @ResolutionStatus int resolutionStatus = RESOLUTION_FAILURE;
             if (e.failure == ConnectionException.FAILURE_BIND) {
diff --git a/services/core/java/com/android/server/pm/InstantAppResolverConnection.java b/services/core/java/com/android/server/pm/InstantAppResolverConnection.java
index 16b4368..c0e9f58 100644
--- a/services/core/java/com/android/server/pm/InstantAppResolverConnection.java
+++ b/services/core/java/com/android/server/pm/InstantAppResolverConnection.java
@@ -85,8 +85,8 @@
         mBgHandler = BackgroundThread.getHandler();
     }
 
-    public final List<InstantAppResolveInfo> getInstantAppResolveInfoList(Intent sanitizedIntent,
-            int hashPrefix[], String token) throws ConnectionException {
+    public List<InstantAppResolveInfo> getInstantAppResolveInfoList(Intent sanitizedIntent,
+            int[] hashPrefix, int userId, String token) throws ConnectionException {
         throwIfCalledOnMainThread();
         IInstantAppResolver target = null;
         try {
@@ -99,7 +99,8 @@
             }
             try {
                 return mGetInstantAppResolveInfoCaller
-                        .getInstantAppResolveInfoList(target, sanitizedIntent, hashPrefix, token);
+                        .getInstantAppResolveInfoList(target, sanitizedIntent, hashPrefix, userId,
+                                token);
             } catch (TimeoutException e) {
                 throw new ConnectionException(ConnectionException.FAILURE_CALL);
             } catch (RemoteException ignore) {
@@ -112,7 +113,7 @@
         return null;
     }
 
-    public final void getInstantAppIntentFilterList(Intent sanitizedIntent, int hashPrefix[],
+    public void getInstantAppIntentFilterList(Intent sanitizedIntent, int[] hashPrefix, int userId,
             String token, PhaseTwoCallback callback, Handler callbackHandler, final long startTime)
             throws ConnectionException {
         final IRemoteCallback remoteCallback = new IRemoteCallback.Stub() {
@@ -126,7 +127,7 @@
         };
         try {
             getRemoteInstanceLazy(token)
-                    .getInstantAppIntentFilterList(sanitizedIntent, hashPrefix, token,
+                    .getInstantAppIntentFilterList(sanitizedIntent, hashPrefix, userId, token,
                             remoteCallback);
         } catch (TimeoutException e) {
             throw new ConnectionException(ConnectionException.FAILURE_BIND);
@@ -352,11 +353,11 @@
         }
 
         public List<InstantAppResolveInfo> getInstantAppResolveInfoList(
-                IInstantAppResolver target, Intent sanitizedIntent,  int hashPrefix[], String token)
-                        throws RemoteException, TimeoutException {
+                IInstantAppResolver target, Intent sanitizedIntent, int[] hashPrefix, int userId,
+                String token) throws RemoteException, TimeoutException {
             final int sequence = onBeforeRemoteCall();
-            target.getInstantAppResolveInfoList(sanitizedIntent, hashPrefix, token, sequence,
-                    mCallback);
+            target.getInstantAppResolveInfoList(sanitizedIntent, hashPrefix, userId, token,
+                    sequence, mCallback);
             return getResultTimed(sequence);
         }
     }
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 2925523..9b097bf 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -162,7 +162,6 @@
 import android.content.pm.InstrumentationInfo;
 import android.content.pm.IntentFilterVerificationInfo;
 import android.content.pm.KeySet;
-import android.content.pm.PackageCleanItem;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageInfoLite;
 import android.content.pm.PackageInstaller;
@@ -619,12 +618,6 @@
 
     private final ProcessLoggingHandler mProcessLoggingHandler;
 
-    /**
-     * Messages for {@link #mHandler} that need to wait for system ready before
-     * being dispatched.
-     */
-    private ArrayList<Message> mPostSystemReadyMessages;
-
     final int mSdkVersion = Build.VERSION.SDK_INT;
 
     final Context mContext;
@@ -637,10 +630,6 @@
     final boolean mIsPreNUpgrade;
     final boolean mIsPreNMR1Upgrade;
 
-    // Have we told the Activity Manager to whitelist the default container service by uid yet?
-    @GuardedBy("mPackages")
-    boolean mDefaultContainerWhitelisted = false;
-
     @GuardedBy("mPackages")
     private boolean mDexOptDialogShown;
 
@@ -1258,7 +1247,6 @@
     static final int MCS_BOUND = 3;
     static final int INIT_COPY = 5;
     static final int MCS_UNBIND = 6;
-    static final int START_CLEANING_PACKAGE = 7;
     static final int POST_INSTALL = 9;
     static final int MCS_RECONNECT = 10;
     static final int MCS_GIVE_UP = 11;
@@ -1602,26 +1590,6 @@
                     Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
                     break;
                 }
-                case START_CLEANING_PACKAGE: {
-                    Process.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT);
-                    final String packageName = (String)msg.obj;
-                    final int userId = msg.arg1;
-                    final boolean andCode = msg.arg2 != 0;
-                    synchronized (mPackages) {
-                        if (userId == UserHandle.USER_ALL) {
-                            int[] users = sUserManager.getUserIds();
-                            for (int user : users) {
-                                mSettings.addPackageToCleanLPw(
-                                        new PackageCleanItem(user, packageName, andCode));
-                            }
-                        } else {
-                            mSettings.addPackageToCleanLPw(
-                                    new PackageCleanItem(userId, packageName, andCode));
-                        }
-                    }
-                    Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
-                    startCleaningPackages();
-                } break;
                 case POST_INSTALL: {
                     if (DEBUG_INSTALL) Log.v(TAG, "Handling post-install for " + msg.arg1);
 
@@ -3246,6 +3214,21 @@
                 mRequiredPermissionControllerPackage = null;
             }
 
+            // Initialize InstantAppRegistry's Instant App list for all users.
+            final int[] userIds = UserManagerService.getInstance().getUserIds();
+            for (PackageParser.Package pkg : mPackages.values()) {
+                if (pkg.isSystem()) {
+                    continue;
+                }
+                for (int userId : userIds) {
+                    final PackageSetting ps = (PackageSetting) pkg.mExtras;
+                    if (ps == null || !ps.getInstantApp(userId) || !ps.getInstalled(userId)) {
+                        continue;
+                    }
+                    mInstantAppRegistry.addInstantAppLPw(userId, ps.appId);
+                }
+            }
+
             mInstallerService = new PackageInstallerService(context, this);
             final Pair<ComponentName, String> instantAppResolverComponent =
                     getInstantAppResolverLPr();
@@ -3273,8 +3256,7 @@
             // should take a fairly small time compare to the other activities (e.g. package
             // scanning).
             final Map<Integer, List<PackageInfo>> userPackages = new HashMap<>();
-            final int[] currentUserIds = UserManagerService.getInstance().getUserIds();
-            for (int userId : currentUserIds) {
+            for (int userId : userIds) {
                 userPackages.put(userId, getInstalledPackages(/*flags*/ 0, userId).getList());
             }
             mDexManager.load(userPackages);
@@ -8978,15 +8960,15 @@
     }
 
     /**
-     * Enforces that only the system UID or shell's UID can call a method exposed
-     * via Binder.
+     * Enforces that only the system UID or root's UID or shell's UID can call
+     * a method exposed via Binder.
      *
      * @param message used as message if SecurityException is thrown
      * @throws SecurityException if the caller is not system or shell
      */
-    private static void enforceSystemOrShell(String message) {
+    private static void enforceSystemOrRootOrShell(String message) {
         final int uid = Binder.getCallingUid();
-        if (uid != Process.SYSTEM_UID && uid != Process.SHELL_UID) {
+        if (uid != Process.SYSTEM_UID && uid != Process.ROOT_UID && uid != Process.SHELL_UID) {
             throw new SecurityException(message);
         }
     }
@@ -9472,7 +9454,7 @@
         if (getInstantAppPackageName(Binder.getCallingUid()) != null) {
             return false;
         }
-        enforceSystemOrShell("runBackgroundDexoptJob");
+        enforceSystemOrRootOrShell("runBackgroundDexoptJob");
         final long identity = Binder.clearCallingIdentity();
         try {
             return BackgroundDexOptService.runIdleOptimizationsNow(this, mContext, packageNames);
@@ -11535,14 +11517,6 @@
             mSettings.insertPackageSettingLPw(pkgSetting, pkg);
             // Add the new setting to mPackages
             mPackages.put(pkg.applicationInfo.packageName, pkg);
-            // Make sure we don't accidentally delete its data.
-            final Iterator<PackageCleanItem> iter = mSettings.mPackagesToBeCleaned.iterator();
-            while (iter.hasNext()) {
-                PackageCleanItem item = iter.next();
-                if (pkgName.equals(item.packageName)) {
-                    iter.remove();
-                }
-            }
 
             // Add the package's KeySets to the global KeySetManagerService
             KeySetManagerService ksms = mSettings.mKeySetManagerService;
@@ -12398,75 +12372,6 @@
         return mMediaMounted || Environment.isExternalStorageEmulated();
     }
 
-    @Override
-    public PackageCleanItem nextPackageToClean(PackageCleanItem lastPackage) {
-        if (getInstantAppPackageName(Binder.getCallingUid()) != null) {
-            return null;
-        }
-        if (!isExternalMediaAvailable()) {
-                // If the external storage is no longer mounted at this point,
-                // the caller may not have been able to delete all of this
-                // packages files and can not delete any more.  Bail.
-            return null;
-        }
-        synchronized (mPackages) {
-            final ArrayList<PackageCleanItem> pkgs = mSettings.mPackagesToBeCleaned;
-            if (lastPackage != null) {
-                pkgs.remove(lastPackage);
-            }
-            if (pkgs.size() > 0) {
-                return pkgs.get(0);
-            }
-        }
-        return null;
-    }
-
-    void schedulePackageCleaning(String packageName, int userId, boolean andCode) {
-        final Message msg = mHandler.obtainMessage(START_CLEANING_PACKAGE,
-                userId, andCode ? 1 : 0, packageName);
-        if (mSystemReady) {
-            msg.sendToTarget();
-        } else {
-            if (mPostSystemReadyMessages == null) {
-                mPostSystemReadyMessages = new ArrayList<>();
-            }
-            mPostSystemReadyMessages.add(msg);
-        }
-    }
-
-    void startCleaningPackages() {
-        // reader
-        if (!isExternalMediaAvailable()) {
-            return;
-        }
-        synchronized (mPackages) {
-            if (mSettings.mPackagesToBeCleaned.isEmpty()) {
-                return;
-            }
-        }
-        Intent intent = new Intent(PackageManager.ACTION_CLEAN_EXTERNAL_STORAGE);
-        intent.setComponent(DEFAULT_CONTAINER_COMPONENT);
-        IActivityManager am = ActivityManager.getService();
-        if (am != null) {
-            int dcsUid = -1;
-            synchronized (mPackages) {
-                if (!mDefaultContainerWhitelisted) {
-                    mDefaultContainerWhitelisted = true;
-                    PackageSetting ps = mSettings.mPackages.get(DEFAULT_CONTAINER_PACKAGE);
-                    dcsUid = UserHandle.getUid(UserHandle.USER_SYSTEM, ps.appId);
-                }
-            }
-            try {
-                if (dcsUid > 0) {
-                    am.backgroundWhitelistUid(dcsUid);
-                }
-                am.startService(null, intent, null, false, mContext.getOpPackageName(),
-                        UserHandle.USER_SYSTEM);
-            } catch (RemoteException e) {
-            }
-        }
-    }
-
     /**
      * Ensure that the install reason matches what we know about the package installer (e.g. whether
      * it is acting on behalf on an enterprise or the user).
@@ -13936,15 +13841,6 @@
         abstract void handleReturnCode();
     }
 
-    private static void clearDirectory(IMediaContainerService mcs, File[] paths) {
-        for (File path : paths) {
-            try {
-                mcs.clearDirectory(path.getAbsolutePath());
-            } catch (RemoteException e) {
-            }
-        }
-    }
-
     static class OriginInfo {
         /**
          * Location where install is coming from, before it has been
@@ -17270,7 +17166,6 @@
             if (outInfo != null) {
                 outInfo.dataRemoved = true;
             }
-            schedulePackageCleaning(packageName, UserHandle.USER_ALL, true);
         }
 
         int removedAppId = -1;
@@ -17927,7 +17822,6 @@
             destroyAppProfilesLIF(pkg, userId);
             clearDefaultBrowserIfNeededForUser(ps.name, userId);
             removeKeystoreDataIfNeeded(nextUserId, ps.appId);
-            schedulePackageCleaning(ps.name, nextUserId, false);
             synchronized (mPackages) {
                 if (clearPackagePreferredActivitiesLPw(ps.name, nextUserId)) {
                     scheduleWritePackageRestrictionsLocked(nextUserId);
@@ -17948,83 +17842,6 @@
         return true;
     }
 
-    private final class ClearStorageConnection implements ServiceConnection {
-        IMediaContainerService mContainerService;
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            synchronized (this) {
-                mContainerService = IMediaContainerService.Stub
-                        .asInterface(Binder.allowBlocking(service));
-                notifyAll();
-            }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-        }
-    }
-
-    private void clearExternalStorageDataSync(String packageName, int userId, boolean allData) {
-        if (DEFAULT_CONTAINER_PACKAGE.equals(packageName)) return;
-
-        final boolean mounted;
-        if (Environment.isExternalStorageEmulated()) {
-            mounted = true;
-        } else {
-            final String status = Environment.getExternalStorageState();
-
-            mounted = status.equals(Environment.MEDIA_MOUNTED)
-                    || status.equals(Environment.MEDIA_MOUNTED_READ_ONLY);
-        }
-
-        if (!mounted) {
-            return;
-        }
-
-        final Intent containerIntent = new Intent().setComponent(DEFAULT_CONTAINER_COMPONENT);
-        int[] users;
-        if (userId == UserHandle.USER_ALL) {
-            users = sUserManager.getUserIds();
-        } else {
-            users = new int[] { userId };
-        }
-        final ClearStorageConnection conn = new ClearStorageConnection();
-        if (mContext.bindServiceAsUser(
-                containerIntent, conn, Context.BIND_AUTO_CREATE, UserHandle.SYSTEM)) {
-            try {
-                for (int curUser : users) {
-                    long timeout = SystemClock.uptimeMillis() + 5000;
-                    synchronized (conn) {
-                        long now;
-                        while (conn.mContainerService == null &&
-                                (now = SystemClock.uptimeMillis()) < timeout) {
-                            try {
-                                conn.wait(timeout - now);
-                            } catch (InterruptedException e) {
-                            }
-                        }
-                    }
-                    if (conn.mContainerService == null) {
-                        return;
-                    }
-
-                    final UserEnvironment userEnv = new UserEnvironment(curUser);
-                    clearDirectory(conn.mContainerService,
-                            userEnv.buildExternalStorageAppCacheDirs(packageName));
-                    if (allData) {
-                        clearDirectory(conn.mContainerService,
-                                userEnv.buildExternalStorageAppDataDirs(packageName));
-                        clearDirectory(conn.mContainerService,
-                                userEnv.buildExternalStorageAppMediaDirs(packageName));
-                    }
-                }
-            } finally {
-                mContext.unbindService(conn);
-            }
-        }
-    }
-
     @Override
     public void clearApplicationProfileData(String packageName) {
         enforceSystemOrRoot("Only the system can clear all profile data");
@@ -18068,7 +17885,6 @@
                         synchronized (mInstallLock) {
                             succeeded = clearApplicationUserDataLIF(packageName, userId);
                         }
-                        clearExternalStorageDataSync(packageName, userId, true);
                         synchronized (mPackages) {
                             mInstantAppRegistry.deleteInstantApplicationMetadataLPw(
                                     packageName, userId);
@@ -18361,7 +18177,6 @@
                     clearAppDataLIF(pkg, userId, flags | Installer.FLAG_CLEAR_CACHE_ONLY);
                     clearAppDataLIF(pkg, userId, flags | Installer.FLAG_CLEAR_CODE_CACHE_ONLY);
                 }
-                clearExternalStorageDataSync(packageName, userId, false);
             }
             if (observer != null) {
                 try {
@@ -20011,14 +19826,6 @@
                     mPermissionCallback);
         }
 
-        // Kick off any messages waiting for system ready
-        if (mPostSystemReadyMessages != null) {
-            for (Message msg : mPostSystemReadyMessages) {
-                msg.sendToTarget();
-            }
-            mPostSystemReadyMessages = null;
-        }
-
         // Watch for external volumes that come and go over time
         final StorageManager storage = mContext.getSystemService(StorageManager.class);
         storage.registerListener(mStorageListener);
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index f2c0395..361416a 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -1302,6 +1302,7 @@
         }
         boolean result = mInterface.runBackgroundDexoptJob(packageNames.isEmpty() ? null :
                 packageNames);
+        getOutPrintWriter().println(result ? "Success" : "Failure");
         return result ? 0 : -1;
     }
 
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 8dd1a0f..6d242f4 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -42,7 +42,6 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.IntentFilterVerificationInfo;
-import android.content.pm.PackageCleanItem;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManagerInternal;
 import android.content.pm.PackageParser;
@@ -209,8 +208,6 @@
 
     public static final String ATTR_NAME = "name";
     public static final String ATTR_PACKAGE = "package";
-    private static final String ATTR_USER = "user";
-    private static final String ATTR_CODE = "code";
     private static final String ATTR_GRANTED = "granted";
     private static final String ATTR_FLAGS = "flags";
     private static final String ATTR_VERSION = "version";
@@ -388,10 +385,6 @@
     private final ArrayMap<Long, Integer> mKeySetRefs =
             new ArrayMap<Long, Integer>();
 
-    // Packages that have been uninstalled and still need their external
-    // storage data deleted.
-    final ArrayList<PackageCleanItem> mPackagesToBeCleaned = new ArrayList<PackageCleanItem>();
-
     // Packages that have been renamed since they were first installed.
     // Keys are the new names of the packages, values are the original
     // names.  The packages appear everywhere else under their original
@@ -2546,17 +2539,6 @@
                 serializer.endTag(null, "shared-user");
             }
 
-            if (mPackagesToBeCleaned.size() > 0) {
-                for (PackageCleanItem item : mPackagesToBeCleaned) {
-                    final String userStr = Integer.toString(item.userId);
-                    serializer.startTag(null, "cleaning-package");
-                    serializer.attribute(null, ATTR_NAME, item.packageName);
-                    serializer.attribute(null, ATTR_CODE, item.andCode ? "true" : "false");
-                    serializer.attribute(null, ATTR_USER, userStr);
-                    serializer.endTag(null, "cleaning-package");
-                }
-            }
-
             if (mRenamedPackages.size() > 0) {
                 for (Map.Entry<String, String> e : mRenamedPackages.entrySet()) {
                     serializer.startTag(null, "renamed-package");
@@ -2972,12 +2954,6 @@
         bp.writeLPr(serializer);
     }
 
-    void addPackageToCleanLPw(PackageCleanItem pkg) {
-        if (!mPackagesToBeCleaned.contains(pkg)) {
-            mPackagesToBeCleaned.add(pkg);
-        }
-    }
-
     boolean readLPw(@NonNull List<UserInfo> users) {
         FileInputStream str = null;
         if (mBackupSettingsFilename.exists()) {
@@ -3070,24 +3046,6 @@
                     readDefaultAppsLPw(parser, 0);
                 } else if (tagName.equals("updated-package")) {
                     readDisabledSysPackageLPw(parser);
-                } else if (tagName.equals("cleaning-package")) {
-                    String name = parser.getAttributeValue(null, ATTR_NAME);
-                    String userStr = parser.getAttributeValue(null, ATTR_USER);
-                    String codeStr = parser.getAttributeValue(null, ATTR_CODE);
-                    if (name != null) {
-                        int userId = UserHandle.USER_SYSTEM;
-                        boolean andCode = true;
-                        try {
-                            if (userStr != null) {
-                                userId = Integer.parseInt(userStr);
-                            }
-                        } catch (NumberFormatException e) {
-                        }
-                        if (codeStr != null) {
-                            andCode = Boolean.parseBoolean(codeStr);
-                        }
-                        addPackageToCleanLPw(new PackageCleanItem(userId, name, andCode));
-                    }
                 } else if (tagName.equals("renamed-package")) {
                     String nname = parser.getAttributeValue(null, "new");
                     String oname = parser.getAttributeValue(null, "old");
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index d15271c..3e0429f 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -257,7 +257,6 @@
 import android.view.animation.AnimationSet;
 import android.view.animation.AnimationUtils;
 import android.view.autofill.AutofillManagerInternal;
-import android.view.inputmethod.InputMethodManagerInternal;
 
 import com.android.internal.R;
 import com.android.internal.accessibility.AccessibilityShortcutController;
@@ -276,6 +275,7 @@
 import com.android.server.GestureLauncherService;
 import com.android.server.LocalServices;
 import com.android.server.SystemServiceManager;
+import com.android.server.inputmethod.InputMethodManagerInternal;
 import com.android.server.policy.keyguard.KeyguardServiceDelegate;
 import com.android.server.policy.keyguard.KeyguardServiceDelegate.DrawnListener;
 import com.android.server.policy.keyguard.KeyguardStateMonitor.StateCallback;
@@ -7862,15 +7862,6 @@
         if (!displayRotation.getDisplayPolicy().navigationBarCanMove()) {
             return false;
         }
-        int delta = newRotation - oldRotation;
-        if (delta < 0) delta += 4;
-        // Likewise we don't rotate seamlessly for 180 degree rotations
-        // in this case the surfaces never resize, and our logic to
-        // revert the transformations on size change will fail. We could
-        // fix this in the future with the "tagged" frames idea.
-        if (delta == Surface.ROTATION_180) {
-            return false;
-        }
 
         final WindowState w = mTopFullscreenOpaqueWindowState;
         if (w != mFocusedWindow) {
diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java
index b4dafc9..5981ab0 100644
--- a/services/core/java/com/android/server/power/Notifier.java
+++ b/services/core/java/com/android/server/power/Notifier.java
@@ -48,13 +48,13 @@
 import android.util.EventLog;
 import android.util.Slog;
 import android.util.StatsLog;
-import android.view.inputmethod.InputMethodManagerInternal;
 
 import com.android.internal.app.IBatteryStats;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.server.EventLogTags;
 import com.android.server.LocalServices;
+import com.android.server.inputmethod.InputMethodManagerInternal;
 import com.android.server.policy.WindowManagerPolicy;
 import com.android.server.statusbar.StatusBarManagerInternal;
 
diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java
index 556038f..41c0be6 100644
--- a/services/core/java/com/android/server/stats/StatsCompanionService.java
+++ b/services/core/java/com/android/server/stats/StatsCompanionService.java
@@ -19,7 +19,6 @@
 import android.app.ActivityManagerInternal;
 import android.app.AlarmManager;
 import android.app.AlarmManager.OnAlarmListener;
-import android.app.PendingIntent;
 import android.app.ProcessMemoryState;
 import android.app.StatsManager;
 import android.bluetooth.BluetoothActivityEnergyInfo;
@@ -65,10 +64,10 @@
 import com.android.internal.net.NetworkStatsFactory;
 import com.android.internal.os.BinderCallsStats.ExportedCallStat;
 import com.android.internal.os.KernelCpuSpeedReader;
-import com.android.internal.os.KernelUidCpuTimeReader;
-import com.android.internal.os.KernelUidCpuClusterTimeReader;
 import com.android.internal.os.KernelUidCpuActiveTimeReader;
+import com.android.internal.os.KernelUidCpuClusterTimeReader;
 import com.android.internal.os.KernelUidCpuFreqTimeReader;
+import com.android.internal.os.KernelUidCpuTimeReader;
 import com.android.internal.os.KernelWakelockReader;
 import com.android.internal.os.KernelWakelockStats;
 import com.android.internal.os.PowerProfile;
@@ -79,7 +78,6 @@
 
 import java.io.File;
 import java.io.FileDescriptor;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -328,7 +326,6 @@
                             PackageManager pm = context.getPackageManager();
                             String app = intent.getData().getSchemeSpecificPart();
                             sStatsd.informOnePackageRemoved(app, uid);
-                            StatsLog.write(StatsLog.GENERIC_ATOM, uid, 1000);
                         }
                     } else {
                         PackageManager pm = context.getPackageManager();
@@ -337,7 +334,6 @@
                         String app = intent.getData().getSchemeSpecificPart();
                         PackageInfo pi = pm.getPackageInfo(app, PackageManager.MATCH_ANY_USER);
                         sStatsd.informOnePackage(app, uid, pi.getLongVersionCode());
-                        StatsLog.write(StatsLog.GENERIC_ATOM, uid, 1001);
                     }
                 } catch (Exception e) {
                     Slog.w(TAG, "Failed to inform statsd of an app update", e);
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index b8c9be7..14294ec 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -565,10 +565,10 @@
     }
 
     @Override
-    public void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver) {
+    public void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver, int type) {
         if (mBar != null) {
             try {
-                mBar.showBiometricDialog(bundle, receiver);
+                mBar.showBiometricDialog(bundle, receiver, type);
             } catch (RemoteException ex) {
             }
         }
diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java
index 5c45afc..b3eafa4 100644
--- a/services/core/java/com/android/server/vr/VrManagerService.java
+++ b/services/core/java/com/android/server/vr/VrManagerService.java
@@ -58,7 +58,6 @@
 import android.util.ArraySet;
 import android.util.Slog;
 import android.util.SparseArray;
-import android.view.inputmethod.InputMethodManagerInternal;
 
 import com.android.internal.R;
 import com.android.internal.util.DumpUtils;
@@ -66,6 +65,7 @@
 import com.android.server.LocalServices;
 import com.android.server.SystemConfig;
 import com.android.server.SystemService;
+import com.android.server.inputmethod.InputMethodManagerInternal;
 import com.android.server.utils.ManagedApplicationService;
 import com.android.server.utils.ManagedApplicationService.BinderChecker;
 import com.android.server.utils.ManagedApplicationService.LogEvent;
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 49638a9..32fa9bf 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -921,6 +921,11 @@
     }
 
     @Override
+    DisplayWindowController getController() {
+        return (DisplayWindowController) super.getController();
+    }
+
+    @Override
     public Display getDisplay() {
         return mDisplay;
     }
@@ -1199,14 +1204,10 @@
         }
 
         forAllWindows(w -> {
-            w.forceSeamlesslyRotateIfAllowed(oldRotation, rotation);
+            w.seamlesslyRotateIfAllowed(getPendingTransaction(), oldRotation, rotation,
+                    rotateSeamlessly);
         }, true /* traverseTopToBottom */);
 
-        // TODO(b/111504081): Consolidate seamless rotation logic.
-        if (rotateSeamlessly) {
-            seamlesslyRotate(getPendingTransaction(), oldRotation, rotation);
-        }
-
         mService.mDisplayManagerInternal.performTraversal(getPendingTransaction());
         scheduleAnimation();
 
@@ -3518,16 +3519,12 @@
 
         private void addStackReferenceIfNeeded(TaskStack stack) {
             if (stack.isActivityTypeHome()) {
-                // TODO(b/111363427) Rollback to throws exceptions once we figure out how to
-                // properly deal with home type stack when external display removed
                 if (mHomeStack != null) {
-                    // throw new IllegalArgumentException("addStackReferenceIfNeeded: home stack="
-                    //        + mHomeStack + " already exist on display=" + this + " stack=" + stack);
-                    Slog.e(TAG, "addStackReferenceIfNeeded: home stack="
+                    throw new IllegalArgumentException("addStackReferenceIfNeeded: home stack="
                             + mHomeStack + " already exist on display=" + this + " stack=" + stack);
-                } else {
-                    mHomeStack = stack;
+
                 }
+                mHomeStack = stack;
             }
             final int windowingMode = stack.getWindowingMode();
             if (windowingMode == WINDOWING_MODE_PINNED) {
diff --git a/services/core/java/com/android/server/wm/DisplayWindowController.java b/services/core/java/com/android/server/wm/DisplayWindowController.java
index 74a8a35..76b6dbe 100644
--- a/services/core/java/com/android/server/wm/DisplayWindowController.java
+++ b/services/core/java/com/android/server/wm/DisplayWindowController.java
@@ -73,6 +73,10 @@
         // override configuration propagation to just here.
     }
 
+    public int getDisplayId() {
+        return mDisplayId;
+    }
+
     /**
      * Positions the task stack at the given position in the task stack container.
      */
diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java
index e817d1a..ac93848 100644
--- a/services/core/java/com/android/server/wm/DockedStackDividerController.java
+++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java
@@ -50,11 +50,11 @@
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 import android.view.animation.PathInterpolator;
-import android.view.inputmethod.InputMethodManagerInternal;
 
 import com.android.internal.policy.DividerSnapAlgorithm;
 import com.android.internal.policy.DockedDividerUtils;
 import com.android.server.LocalServices;
+import com.android.server.inputmethod.InputMethodManagerInternal;
 import com.android.server.wm.WindowManagerService.H;
 
 import java.io.PrintWriter;
diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java
index dea4076..4dbd858 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimationController.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java
@@ -21,6 +21,7 @@
 import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
 import static android.view.RemoteAnimationTarget.MODE_CLOSING;
 import static android.view.WindowManager.INPUT_CONSUMER_RECENTS_ANIMATION;
+
 import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
 import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_RECENTS_ANIM;
 import static com.android.server.wm.AnimationAdapterProto.REMOTE;
@@ -47,16 +48,16 @@
 import android.view.RemoteAnimationTarget;
 import android.view.SurfaceControl;
 import android.view.SurfaceControl.Transaction;
-import android.view.inputmethod.InputMethodManagerInternal;
-
-import com.google.android.collect.Sets;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.server.LocalServices;
 import com.android.server.input.InputWindowHandle;
+import com.android.server.inputmethod.InputMethodManagerInternal;
 import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;
 import com.android.server.wm.utils.InsetUtils;
 
+import com.google.android.collect.Sets;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 
@@ -370,10 +371,14 @@
                     && mTargetAppToken.inSplitScreenSecondaryWindowingMode()
                             ? mMinimizedHomeBounds
                             : null;
-            final Rect contentInsets = mTargetAppToken != null
-                    && mTargetAppToken.findMainWindow() != null
-                            ? mTargetAppToken.findMainWindow().mContentInsets
-                            : null;
+            final Rect contentInsets;
+            if (mTargetAppToken != null && mTargetAppToken.findMainWindow() != null) {
+                contentInsets = mTargetAppToken.findMainWindow().mContentInsets;
+            } else {
+                // If the window for the activity had not yet been created, use the display insets.
+                mService.getStableInsets(mDisplayId, mTmpRect);
+                contentInsets = mTmpRect;
+            }
             mRunner.onAnimationStart(mController, appTargets, contentInsets, minimizedHomeBounds);
             if (DEBUG_RECENTS_ANIMATIONS) {
                 Slog.d(TAG, "startAnimation(): Notify animation start:");
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index d8cbb26..86b14337 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -174,24 +174,6 @@
         return null;
     }
 
-    /**
-     * Get an array with display ids ordered by focus priority - last items should be given
-     * focus first. Sparse array just maps position to displayId.
-     */
-    void getDisplaysInFocusOrder(SparseIntArray displaysInFocusOrder) {
-        displaysInFocusOrder.clear();
-
-        final int size = mChildren.size();
-        for (int i = 0; i < size; ++i) {
-            final DisplayContent displayContent = mChildren.get(i);
-            if (displayContent.isRemovalDeferred()) {
-                // Don't report displays that are going to be removed soon.
-                continue;
-            }
-            displaysInFocusOrder.put(i, displayContent.getDisplayId());
-        }
-    }
-
     DisplayContent getDisplayContent(int displayId) {
         for (int i = mChildren.size() - 1; i >= 0; --i) {
             final DisplayContent current = mChildren.get(i);
@@ -1098,6 +1080,25 @@
     }
 
     @Override
+    void positionChildAt(int position, DisplayContent child, boolean includingParents) {
+        super.positionChildAt(position, child, includingParents);
+        final RootWindowContainerController controller = getController();
+        if (controller != null) {
+            controller.onChildPositionChanged(child, position);
+        }
+    }
+
+    void positionChildAt(int position, DisplayContent child) {
+        // Only called from controller so no need to notify the change to controller.
+        super.positionChildAt(position, child, false /* includingParents */);
+    }
+
+    @Override
+    RootWindowContainerController getController() {
+        return (RootWindowContainerController) super.getController();
+    }
+
+    @Override
     void scheduleAnimation() {
         mService.scheduleAnimationLocked();
     }
diff --git a/services/core/java/com/android/server/wm/RootWindowContainerController.java b/services/core/java/com/android/server/wm/RootWindowContainerController.java
new file mode 100644
index 0000000..93be6e9
--- /dev/null
+++ b/services/core/java/com/android/server/wm/RootWindowContainerController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm;
+
+/**
+ * Controller for the root container. This is created by activity manager to link activity
+ * stack supervisor to the root window container they use in window manager.
+ */
+public class RootWindowContainerController
+        extends WindowContainerController<RootWindowContainer, RootWindowContainerListener> {
+
+    public RootWindowContainerController(RootWindowContainerListener listener) {
+        super(listener, WindowManagerService.getInstance());
+        synchronized (mWindowMap) {
+            mRoot.setController(this);
+        }
+    }
+
+    void onChildPositionChanged(DisplayContent child, int position) {
+        // This callback invokes to AM directly so here assumes AM lock is held. If there is another
+        // path called only with WM lock, it should change to use handler to post or move outside of
+        // WM lock with adding AM lock.
+        mListener.onChildPositionChanged(child.getController(), position);
+    }
+
+    /** Move the display to the given position. */
+    public void positionChildAt(DisplayWindowController child, int position) {
+        synchronized (mWindowMap) {
+            mContainer.positionChildAt(position, child.mContainer);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/wm/RootWindowContainerListener.java b/services/core/java/com/android/server/wm/RootWindowContainerListener.java
new file mode 100644
index 0000000..f413e3f7
--- /dev/null
+++ b/services/core/java/com/android/server/wm/RootWindowContainerListener.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm;
+
+/**
+ * Interface used by the creator of {@link RootWindowContainerController} to notify the changes to
+ * the display container in activity manager.
+ */
+public interface RootWindowContainerListener extends WindowContainerListener {
+    /** Called when the z-order of display is changed. */
+    void onChildPositionChanged(DisplayWindowController childController, int position);
+}
diff --git a/services/core/java/com/android/server/wm/ForcedSeamlessRotator.java b/services/core/java/com/android/server/wm/SeamlessRotator.java
similarity index 84%
rename from services/core/java/com/android/server/wm/ForcedSeamlessRotator.java
rename to services/core/java/com/android/server/wm/SeamlessRotator.java
index f5e6e72..6f597277 100644
--- a/services/core/java/com/android/server/wm/ForcedSeamlessRotator.java
+++ b/services/core/java/com/android/server/wm/SeamlessRotator.java
@@ -16,12 +16,14 @@
 
 package com.android.server.wm;
 
+import static android.view.Surface.ROTATION_180;
 import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 
 import android.graphics.Matrix;
 import android.view.DisplayInfo;
 import android.view.Surface.Rotation;
+import android.view.SurfaceControl.Transaction;
 
 import com.android.server.wm.utils.CoordinateTransforms;
 
@@ -29,22 +31,21 @@
 import java.io.StringWriter;
 
 /**
- * Helper class for forced seamless rotation.
+ * Helper class for seamless rotation.
  *
  * Works by transforming the window token back into the old display rotation.
  *
  * Uses deferTransactionUntil instead of latching on the buffer size to allow for seamless 180
  * degree rotations.
- * TODO(b/111504081): Consolidate seamless rotation logic.
  */
-public class ForcedSeamlessRotator {
+public class SeamlessRotator {
 
     private final Matrix mTransform = new Matrix();
     private final float[] mFloat9 = new float[9];
     private final int mOldRotation;
     private final int mNewRotation;
 
-    public ForcedSeamlessRotator(int oldRotation, int newRotation, DisplayInfo info) {
+    public SeamlessRotator(int oldRotation, int newRotation, DisplayInfo info) {
         mOldRotation = oldRotation;
         mNewRotation = newRotation;
 
@@ -62,8 +63,8 @@
      * Applies a transform to the window token's surface that undoes the effect of the global
      * display rotation.
      */
-    public void unrotate(WindowToken token) {
-        token.getPendingTransaction().setMatrix(token.getSurfaceControl(), mTransform, mFloat9);
+    public void unrotate(Transaction transaction, WindowToken token) {
+        transaction.setMatrix(token.getSurfaceControl(), mTransform, mFloat9);
     }
 
     /**
@@ -94,6 +95,10 @@
             win.getPendingTransaction().deferTransactionUntil(win.mSurfaceControl,
                     win.mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),
                     win.getFrameNumber());
+            win.getPendingTransaction().deferTransactionUntil(
+                    win.mWinAnimator.mSurfaceController.mSurfaceControl,
+                    win.mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),
+                    win.getFrameNumber());
         }
     }
 
diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java
index 5cf5e0d..f9a71d3 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -58,7 +58,8 @@
 import com.android.internal.os.logging.MetricsLoggerWrapper;
 import com.android.internal.view.IInputContext;
 import com.android.internal.view.IInputMethodClient;
-import com.android.internal.view.IInputMethodManager;
+import com.android.server.LocalServices;
+import com.android.server.inputmethod.InputMethodManagerInternal;
 import com.android.server.wm.WindowManagerService.H;
 
 import java.io.PrintWriter;
@@ -73,6 +74,7 @@
     final WindowManagerService mService;
     final IWindowSessionCallback mCallback;
     final IInputMethodClient mClient;
+    final InputMethodManagerInternal mInputMethodManagerInternal;
     final int mUid;
     final int mPid;
     private final String mStringName;
@@ -98,6 +100,12 @@
         mService = service;
         mCallback = callback;
         mClient = client;
+        // Depending on the timing when Session object gets called and SystemServer#mFactoryTestMode
+        // this could be null, right?
+        final InputMethodManagerInternal immInternal =
+                LocalServices.getService(InputMethodManagerInternal.class);
+        mInputMethodManagerInternal =
+                immInternal != null ? immInternal : InputMethodManagerInternal.NOP;
         mUid = Binder.getCallingUid();
         mPid = Binder.getCallingPid();
         mLastReportedAnimatorScale = service.getCurrentAnimatorScale();
@@ -126,34 +134,12 @@
         sb.append("}");
         mStringName = sb.toString();
 
-        synchronized (mService.mWindowMap) {
-            if (mService.mInputMethodManager == null && mService.mHaveInputMethods) {
-                IBinder b = ServiceManager.getService(
-                        Context.INPUT_METHOD_SERVICE);
-                mService.mInputMethodManager = IInputMethodManager.Stub.asInterface(b);
-            }
-        }
-        long ident = Binder.clearCallingIdentity();
+        mInputMethodManagerInternal.addClient(client, inputContext, mUid, mPid);
         try {
-            // Note: it is safe to call in to the input method manager
-            // here because we are not holding our lock.
-            if (mService.mInputMethodManager != null) {
-                mService.mInputMethodManager.addClient(client, inputContext,
-                        mUid, mPid);
-            } else {
-                client.setUsingInputMethod(false);
-            }
             client.asBinder().linkToDeath(this, 0);
         } catch (RemoteException e) {
             // The caller has died, so we can just forget about this.
-            try {
-                if (mService.mInputMethodManager != null) {
-                    mService.mInputMethodManager.removeClient(client);
-                }
-            } catch (RemoteException ee) {
-            }
-        } finally {
-            Binder.restoreCallingIdentity(ident);
+            mInputMethodManagerInternal.removeClient(client);
         }
     }
 
@@ -173,14 +159,7 @@
 
     @Override
     public void binderDied() {
-        // Note: it is safe to call in to the input method manager
-        // here because we are not holding our lock.
-        try {
-            if (mService.mInputMethodManager != null) {
-                mService.mInputMethodManager.removeClient(mClient);
-            }
-        } catch (RemoteException e) {
-        }
+        mInputMethodManagerInternal.removeClient(mClient);
         synchronized(mService.mWindowMap) {
             mClient.asBinder().unlinkToDeath(this, 0);
             mClientDead = true;
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index fee0fcb..8e704a8 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -122,7 +122,7 @@
     private int mTreeWeight = 1;
 
     /**
-     * Indicates whether we are animating and have committed the transaction to reparent our 
+     * Indicates whether we are animating and have committed the transaction to reparent our
      * surface to the animation leash
      */
     private boolean mCommittedReparentToAnimationLeash;
@@ -749,20 +749,6 @@
     }
 
     /**
-     * Seamlessly rotates the container, by recomputing the location in the new
-     * rotation, and rotating buffers until they are updated for the new rotation.
-     *
-     * @param t the transaction to perform the seamless rotation in
-     * @param oldRotation the rotation we are rotating from
-     * @param newRotation the rotation we are rotating to
-     */
-    void seamlesslyRotate(Transaction t, int oldRotation, int newRotation) {
-        for (int i = mChildren.size() - 1; i >= 0; --i) {
-            mChildren.get(i).seamlesslyRotate(t, oldRotation, newRotation);
-        }
-    }
-
-    /**
      * Returns true if this container is opaque and fills all the space made available by its parent
      * container.
      *
diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java
index 44783f8..df680f2 100644
--- a/services/core/java/com/android/server/wm/WindowManagerInternal.java
+++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java
@@ -30,6 +30,7 @@
 import android.view.MagnificationSpec;
 import android.view.WindowInfo;
 
+import com.android.internal.view.IInputMethodClient;
 import com.android.server.input.InputManagerService;
 import com.android.server.policy.WindowManagerPolicy;
 
@@ -441,4 +442,9 @@
      * Returns {@code true} if a Window owned by {@code uid} has focus.
      */
     public abstract boolean isUidFocused(int uid);
+
+    /**
+     * Returns {@code true} if a process that is identified by {@code client} has IME focus.
+     */
+    public abstract boolean inputMethodClientHasFocus(IInputMethodClient client);
 }
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 158d09a..e80a47e 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -234,7 +234,6 @@
 import com.android.internal.util.LatencyTracker;
 import com.android.internal.view.IInputContext;
 import com.android.internal.view.IInputMethodClient;
-import com.android.internal.view.IInputMethodManager;
 import com.android.internal.view.WindowManagerPolicyThread;
 import com.android.server.AnimationThread;
 import com.android.server.DisplayThread;
@@ -417,8 +416,6 @@
 
     final Context mContext;
 
-    final boolean mHaveInputMethods;
-
     final boolean mHasPermanentDpad;
     final long mDrawLockTimeoutMillis;
     final boolean mAllowAnimationsInLowPowerMode;
@@ -521,8 +518,6 @@
     /** List of window currently causing non-system overlay windows to be hidden. */
     private ArrayList<WindowState> mHidingNonSystemOverlayWindows = new ArrayList<>();
 
-    IInputMethodManager mInputMethodManager;
-
     AccessibilityController mAccessibilityController;
     private RecentsAnimationController mRecentsAnimationController;
 
@@ -905,11 +900,10 @@
     }
 
     public static WindowManagerService main(final Context context, final InputManagerService im,
-            final boolean haveInputMethods, final boolean showBootMsgs, final boolean onlyCore,
-            WindowManagerPolicy policy) {
+            final boolean showBootMsgs, final boolean onlyCore, WindowManagerPolicy policy) {
         DisplayThread.getHandler().runWithScissors(() ->
-                sInstance = new WindowManagerService(context, im, haveInputMethods, showBootMsgs,
-                        onlyCore, policy), 0);
+                sInstance = new WindowManagerService(context, im, showBootMsgs, onlyCore, policy),
+                0);
         return sInstance;
     }
 
@@ -930,11 +924,9 @@
     }
 
     private WindowManagerService(Context context, InputManagerService inputManager,
-            boolean haveInputMethods, boolean showBootMsgs, boolean onlyCore,
-            WindowManagerPolicy policy) {
+            boolean showBootMsgs, boolean onlyCore, WindowManagerPolicy policy) {
         installLock(this, INDEX_WINDOW);
         mContext = context;
-        mHaveInputMethods = haveInputMethods;
         mAllowBootMessages = showBootMsgs;
         mOnlyCore = onlyCore;
         mLimitedAlphaCompositing = context.getResources().getBoolean(
@@ -1907,11 +1899,8 @@
 
             win.setFrameNumber(frameNumber);
 
-            // TODO(b/111504081): Consolidate seamless rotation logic.
-            if (win.mPendingForcedSeamlessRotate != null && !mWaitingForConfig) {
-                win.mPendingForcedSeamlessRotate.finish(win.mToken, win);
-                win.mFinishForcedSeamlessRotateFrameNumber = win.getFrameNumber();
-                win.mPendingForcedSeamlessRotate = null;
+            if (!mWaitingForConfig) {
+                win.finishSeamlessRotation();
             }
 
             int attrChanges = 0;
@@ -5051,30 +5040,6 @@
     }
 
     @Override
-    public boolean inputMethodClientHasFocus(IInputMethodClient client) {
-        synchronized (mWindowMap) {
-            // TODO: multi-display
-            if (getDefaultDisplayContentLocked().inputMethodClientHasFocus(client)) {
-                return true;
-            }
-
-            // Okay, how about this...  what is the current focus?
-            // It seems in some cases we may not have moved the IM
-            // target window, such as when it was in a pop-up window,
-            // so let's also look at the current focus.  (An example:
-            // go to Gmail, start searching so the keyboard goes up,
-            // press home.  Sometimes the IME won't go down.)
-            // Would be nice to fix this more correctly, but it's
-            // way at the end of a release, and this should be good enough.
-            if (mCurrentFocus != null && mCurrentFocus.mSession.mClient != null
-                    && mCurrentFocus.mSession.mClient.asBinder() == client.asBinder()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
     public void getInitialDisplaySize(int displayId, Point size) {
         synchronized (mWindowMap) {
             final DisplayContent displayContent = mRoot.getDisplayContent(displayId);
@@ -5380,17 +5345,6 @@
         mWindowPlacerLocked.performSurfacePlacement();
     }
 
-    /**
-     * Get an array with display ids ordered by focus priority - last items should be given
-     * focus first. Sparse array just maps position to displayId.
-     */
-    // TODO: Maintain display list in focus order in ActivityManager and remove this call.
-    public void getDisplaysInFocusOrder(SparseIntArray displaysInFocusOrder) {
-        synchronized(mWindowMap) {
-            mRoot.getDisplaysInFocusOrder(displaysInFocusOrder);
-        }
-    }
-
     @Override
     public void setOverscan(int displayId, int left, int top, int right, int bottom) {
         if (mContext.checkCallingOrSelfPermission(
@@ -7116,7 +7070,7 @@
     }
 
     void markForSeamlessRotation(WindowState w, boolean seamlesslyRotated) {
-        if (seamlesslyRotated == w.mSeamlesslyRotated) {
+        if (seamlesslyRotated == w.mSeamlesslyRotated || w.mForceSeamlesslyRotate) {
             return;
         }
         w.mSeamlesslyRotated = seamlesslyRotated;
@@ -7443,6 +7397,30 @@
                 return mCurrentFocus != null ? uid == mCurrentFocus.getOwningUid() : false;
             }
         }
+
+        @Override
+        public boolean inputMethodClientHasFocus(IInputMethodClient client) {
+            synchronized (mWindowMap) {
+                // TODO: multi-display
+                if (getDefaultDisplayContentLocked().inputMethodClientHasFocus(client)) {
+                    return true;
+                }
+
+                // Okay, how about this...  what is the current focus?
+                // It seems in some cases we may not have moved the IM
+                // target window, such as when it was in a pop-up window,
+                // so let's also look at the current focus.  (An example:
+                // go to Gmail, start searching so the keyboard goes up,
+                // press home.  Sometimes the IME won't go down.)
+                // Would be nice to fix this more correctly, but it's
+                // way at the end of a release, and this should be good enough.
+                if (mCurrentFocus != null && mCurrentFocus.mSession.mClient != null
+                        && mCurrentFocus.mSession.mClient.asBinder() == client.asBinder()) {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 
     void registerAppFreezeListener(AppFreezeListener listener) {
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 58fb7a0..97313f2 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -71,12 +71,20 @@
 import static android.view.WindowManagerGlobal.RELAYOUT_RES_DRAG_RESIZING_FREEFORM;
 import static android.view.WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME;
 import static android.view.WindowManagerGlobal.RELAYOUT_RES_SURFACE_CHANGED;
+
 import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
 import static com.android.server.policy.WindowManagerPolicy.TRANSIT_ENTER;
 import static com.android.server.policy.WindowManagerPolicy.TRANSIT_EXIT;
 import static com.android.server.policy.WindowManagerPolicy.TRANSIT_PREVIEW_DONE;
+import static com.android.server.wm.AnimationSpecProto.MOVE;
 import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER;
 import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_FREEFORM;
+import static com.android.server.wm.IdentifierProto.HASH_CODE;
+import static com.android.server.wm.IdentifierProto.TITLE;
+import static com.android.server.wm.IdentifierProto.USER_ID;
+import static com.android.server.wm.MoveAnimationSpecProto.DURATION_MS;
+import static com.android.server.wm.MoveAnimationSpecProto.FROM;
+import static com.android.server.wm.MoveAnimationSpecProto.TO;
 import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
 import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
 import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
@@ -108,13 +116,6 @@
 import static com.android.server.wm.WindowStateAnimator.DRAW_PENDING;
 import static com.android.server.wm.WindowStateAnimator.HAS_DRAWN;
 import static com.android.server.wm.WindowStateAnimator.READY_TO_SHOW;
-import static com.android.server.wm.IdentifierProto.HASH_CODE;
-import static com.android.server.wm.IdentifierProto.TITLE;
-import static com.android.server.wm.IdentifierProto.USER_ID;
-import static com.android.server.wm.AnimationSpecProto.MOVE;
-import static com.android.server.wm.MoveAnimationSpecProto.DURATION_MS;
-import static com.android.server.wm.MoveAnimationSpecProto.FROM;
-import static com.android.server.wm.MoveAnimationSpecProto.TO;
 import static com.android.server.wm.WindowStateProto.ANIMATING_EXIT;
 import static com.android.server.wm.WindowStateProto.ANIMATOR;
 import static com.android.server.wm.WindowStateProto.ATTRIBUTES;
@@ -122,7 +123,8 @@
 import static com.android.server.wm.WindowStateProto.CONTENT_INSETS;
 import static com.android.server.wm.WindowStateProto.DESTROYING;
 import static com.android.server.wm.WindowStateProto.DISPLAY_ID;
-import static com.android.server.wm.WindowStateProto.FINISHED_FORCED_SEAMLESS_ROTATION_FRAME;
+import static com.android.server.wm.WindowStateProto.FINISHED_SEAMLESS_ROTATION_FRAME;
+import static com.android.server.wm.WindowStateProto.FORCE_SEAMLESS_ROTATION;
 import static com.android.server.wm.WindowStateProto.GIVEN_CONTENT_INSETS;
 import static com.android.server.wm.WindowStateProto.HAS_SURFACE;
 import static com.android.server.wm.WindowStateProto.IDENTIFIER;
@@ -131,7 +133,7 @@
 import static com.android.server.wm.WindowStateProto.IS_VISIBLE;
 import static com.android.server.wm.WindowStateProto.OUTSETS;
 import static com.android.server.wm.WindowStateProto.OVERSCAN_INSETS;
-import static com.android.server.wm.WindowStateProto.PENDING_FORCED_SEAMLESS_ROTATION;
+import static com.android.server.wm.WindowStateProto.PENDING_SEAMLESS_ROTATION;
 import static com.android.server.wm.WindowStateProto.REMOVED;
 import static com.android.server.wm.WindowStateProto.REMOVE_ON_EXIT;
 import static com.android.server.wm.WindowStateProto.REQUESTED_HEIGHT;
@@ -145,8 +147,6 @@
 import static com.android.server.wm.WindowStateProto.VISIBLE_INSETS;
 import static com.android.server.wm.WindowStateProto.WINDOW_CONTAINER;
 import static com.android.server.wm.WindowStateProto.WINDOW_FRAMES;
-import static com.android.server.wm.utils.CoordinateTransforms.transformRect;
-import static com.android.server.wm.utils.CoordinateTransforms.transformToRotation;
 
 import android.annotation.CallSuper;
 import android.app.AppOpsManager;
@@ -279,11 +279,10 @@
      * Special mode that is intended only for the rounded corner overlay: during rotation
      * transition, we un-rotate the window token such that the window appears as it did before the
      * rotation.
-     * TODO(b/111504081): Consolidate seamless rotation logic.
      */
     final boolean mForceSeamlesslyRotate;
-    ForcedSeamlessRotator mPendingForcedSeamlessRotate;
-    long mFinishForcedSeamlessRotateFrameNumber;
+    SeamlessRotator mPendingSeamlessRotate;
+    long mFinishSeamlessRotateFrameNumber;
 
     private RemoteCallbackList<IWindowFocusObserver> mFocusCallbacks;
 
@@ -632,15 +631,30 @@
 
     private static final float DEFAULT_DIM_AMOUNT_DEAD_WINDOW = 0.5f;
 
-    void forceSeamlesslyRotateIfAllowed(int oldRotation, int rotation) {
-        if (mForceSeamlesslyRotate) {
-            if (mPendingForcedSeamlessRotate != null) {
-                oldRotation = mPendingForcedSeamlessRotate.getOldRotation();
-            }
+    void seamlesslyRotateIfAllowed(Transaction transaction, int oldRotation, int rotation,
+            boolean requested) {
+        // Invisible windows and the wallpaper do not participate in the seamless rotation animation
+        if (!isVisibleNow() || mIsWallpaper) {
+            return;
+        }
 
-            mPendingForcedSeamlessRotate = new ForcedSeamlessRotator(
-                    oldRotation, rotation, getDisplayInfo());
-            mPendingForcedSeamlessRotate.unrotate(this.mToken);
+        if (mPendingSeamlessRotate != null) {
+            oldRotation = mPendingSeamlessRotate.getOldRotation();
+        }
+
+        if (mForceSeamlesslyRotate || requested) {
+            mPendingSeamlessRotate = new SeamlessRotator(oldRotation, rotation, getDisplayInfo());
+            mPendingSeamlessRotate.unrotate(transaction, this.mToken);
+            mService.markForSeamlessRotation(this, true);
+        }
+    }
+
+    void finishSeamlessRotation() {
+        if (mPendingSeamlessRotate != null) {
+            mPendingSeamlessRotate.finish(this.mToken, this);
+            mFinishSeamlessRotateFrameNumber = getFrameNumber();
+            mPendingSeamlessRotate = null;
+            mService.markForSeamlessRotation(this, false);
         }
     }
 
@@ -3301,11 +3315,9 @@
         proto.write(REMOVED, mRemoved);
         proto.write(IS_ON_SCREEN, isOnScreen());
         proto.write(IS_VISIBLE, isVisible());
-        if (mForceSeamlesslyRotate) {
-            proto.write(PENDING_FORCED_SEAMLESS_ROTATION, mPendingForcedSeamlessRotate != null);
-            proto.write(FINISHED_FORCED_SEAMLESS_ROTATION_FRAME,
-                    mFinishForcedSeamlessRotateFrameNumber);
-        }
+        proto.write(PENDING_SEAMLESS_ROTATION, mPendingSeamlessRotate != null);
+        proto.write(FINISHED_SEAMLESS_ROTATION_FRAME, mFinishSeamlessRotateFrameNumber);
+        proto.write(FORCE_SEAMLESS_ROTATION, mForceSeamlesslyRotate);
         proto.end(token);
     }
 
@@ -3461,16 +3473,16 @@
             pw.print(prefix); pw.print("mLastFreezeDuration=");
                     TimeUtils.formatDuration(mLastFreezeDuration, pw); pw.println();
         }
-        if (mForceSeamlesslyRotate) {
-            pw.print(prefix); pw.print("forceSeamlesslyRotate: pending=");
-            if (mPendingForcedSeamlessRotate != null) {
-                mPendingForcedSeamlessRotate.dump(pw);
-            } else {
-                pw.print("null");
-            }
-            pw.print(" finishedFrameNumber="); pw.print(mFinishForcedSeamlessRotateFrameNumber);
-            pw.println();
+        pw.print(prefix); pw.print("mForceSeamlesslyRotate="); pw.print(mForceSeamlesslyRotate);
+        pw.print(" seamlesslyRotate: pending=");
+        if (mPendingSeamlessRotate != null) {
+            mPendingSeamlessRotate.dump(pw);
+        } else {
+            pw.print("null");
         }
+        pw.print(" finishedFrameNumber="); pw.print(mFinishSeamlessRotateFrameNumber);
+        pw.println();
+
         if (mHScale != 1 || mVScale != 1) {
             pw.print(prefix); pw.print("mHScale="); pw.print(mHScale);
                     pw.print(" mVScale="); pw.println(mVScale);
@@ -4716,8 +4728,8 @@
 
         // Freeze position while we're unrotated, so the surface remains at the position it was
         // prior to the rotation.
-        if (!mSurfaceAnimator.hasLeash() && mPendingForcedSeamlessRotate == null &&
-                !mLastSurfacePosition.equals(mSurfacePosition)) {
+        if (!mSurfaceAnimator.hasLeash() && mPendingSeamlessRotate == null
+                && !mLastSurfacePosition.equals(mSurfacePosition)) {
             t.setPosition(mSurfaceControl, mSurfacePosition.x, mSurfacePosition.y);
             mLastSurfacePosition.set(mSurfacePosition.x, mSurfacePosition.y);
             if (surfaceInsetsChanging() && mWinAnimator.hasSurface()) {
@@ -4870,31 +4882,6 @@
         mFrameNumber = frameNumber;
     }
 
-    @Override
-    void seamlesslyRotate(Transaction t, int oldRotation, int newRotation) {
-        // Invisible windows, the wallpaper, and force seamlessly rotated windows do not participate
-        // in the regular seamless rotation animation.
-        if (!isVisibleNow() || mIsWallpaper || mForceSeamlesslyRotate) {
-            return;
-        }
-        final Matrix transform = mTmpMatrix;
-
-        mService.markForSeamlessRotation(this, true);
-
-        // We rotated the screen, but have not performed a new layout pass yet. In the mean time,
-        // we recompute the coordinates of mFrame in the new orientation, so the surface can be
-        // properly placed.
-        transformToRotation(oldRotation, newRotation, getDisplayInfo(), transform);
-        transformRect(transform, mWindowFrames.mFrame, null /* tmpRectF */);
-
-        updateSurfacePosition(t);
-        mWinAnimator.seamlesslyRotate(t, oldRotation, newRotation);
-
-        // Dispatch to children only after mFrame has been updated, as it's needed in the
-        // child's updateSurfacePosition.
-        super.seamlesslyRotate(t, oldRotation, newRotation);
-    }
-
     public void getMaxVisibleBounds(Rect out) {
         if (out.isEmpty()) {
             out.set(mWindowFrames.mVisibleFrame);
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index 7966d5b..b158ae2 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -686,7 +686,6 @@
         final int displayId = mWin.getDisplayId();
         final ScreenRotationAnimation screenRotationAnimation =
                 mAnimator.getScreenRotationAnimationLocked(displayId);
-        // TODO(b/111504081): Consolidate seamless rotation logic.
         final boolean windowParticipatesInScreenRotationAnimation =
                 !mWin.mForceSeamlesslyRotate;
         final boolean screenAnimation = screenRotationAnimation != null
@@ -878,7 +877,6 @@
         mExtraVScale = (float) 1.0;
 
         boolean wasForceScaled = mForceScaleUntilResize;
-        boolean wasSeamlesslyRotated = w.mSeamlesslyRotated;
 
         // Once relayout has been called at least once, we need to make sure
         // we only resize the client surface during calls to relayout. For
@@ -898,7 +896,6 @@
         // If we are undergoing seamless rotation, the surface has already
         // been set up to persist at it's old location. We need to freeze
         // updates until a resize occurs.
-        mService.markForSeamlessRotation(w, w.mSeamlesslyRotated && !mSurfaceResized);
 
         Rect clipRect = null;
         if (calculateCrop(mTmpClipRect)) {
@@ -1069,15 +1066,15 @@
 
         // If we are ending the scaling mode. We switch to SCALING_MODE_FREEZE
         // to prevent further updates until buffer latch.
-        // When ending both force scaling, and seamless rotation, we need to freeze
-        // the Surface geometry until a buffer comes in at the new size (normally position and crop
-        // are unfrozen). setGeometryAppliesWithResizeInTransaction accomplishes this for us.
-        if ((wasForceScaled && !mForceScaleUntilResize) ||
-                (wasSeamlesslyRotated && !w.mSeamlesslyRotated)) {
+        // We also need to freeze the Surface geometry until a buffer
+        // comes in at the new size (normally position and crop are unfrozen).
+        // setGeometryAppliesWithResizeInTransaction accomplishes this for us.
+        if (wasForceScaled && !mForceScaleUntilResize) {
             mSurfaceController.setGeometryAppliesWithResizeInTransaction(true);
             mSurfaceController.forceScaleableInTransaction(false);
         }
 
+
         if (!w.mSeamlesslyRotated) {
             applyCrop(clipRect, recoveringMemory);
             mSurfaceController.setMatrixInTransaction(mDsDx * w.mHScale * mExtraHScale,
@@ -1509,29 +1506,6 @@
         }
     }
 
-    // TODO(b/111504081): Consolidate seamless rotation logic.
-    @Deprecated
-    void seamlesslyRotate(SurfaceControl.Transaction t, int oldRotation, int newRotation) {
-        final WindowState w = mWin;
-
-        // We rotated the screen, but have not received a new buffer with the correct size yet. In
-        // the mean time, we rotate the buffer we have to the new orientation.
-        final Matrix transform = mService.mTmpTransform;
-        transformToRotation(oldRotation, newRotation, w.getFrameLw().width(),
-                w.getFrameLw().height(), transform);
-        transform.getValues(mService.mTmpFloats);
-
-        float DsDx = mService.mTmpFloats[Matrix.MSCALE_X];
-        float DtDx = mService.mTmpFloats[Matrix.MSKEW_Y];
-        float DtDy = mService.mTmpFloats[Matrix.MSKEW_X];
-        float DsDy = mService.mTmpFloats[Matrix.MSCALE_Y];
-        float nx = mService.mTmpFloats[Matrix.MTRANS_X];
-        float ny = mService.mTmpFloats[Matrix.MTRANS_Y];
-        mSurfaceController.setPosition(t, nx, ny, false);
-        mSurfaceController.setMatrix(t, DsDx * w.mHScale, DtDx * w.mVScale, DtDy
-                * w.mHScale, DsDy * w.mVScale, false);
-    }
-
     /** The force-scaled state for a given window can persist past
      * the state for it's stack as the windows complete resizing
      * independently of one another.
diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java
index 66c8cca..6821e94 100644
--- a/services/core/java/com/android/server/wm/WindowSurfaceController.java
+++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java
@@ -225,16 +225,6 @@
         }
     }
 
-    void setFinalCropInTransaction(Rect clipRect) {
-        if (SHOW_TRANSACTIONS) logSurface(
-                "FINAL CROP " + clipRect.toShortString(), null);
-        try {
-            mSurfaceControl.setFinalCrop(clipRect);
-        } catch (RuntimeException e) {
-            Slog.w(TAG, "Error disconnecting surface in: " + this, e);
-        }
-    }
-
     void setLayerStackInTransaction(int layerStack) {
         if (mSurfaceControl != null) {
             mSurfaceControl.setLayerStack(layerStack);
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 664a837..c131858 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7758,6 +7758,13 @@
     }
 
     @Override
+    public ComponentName getProfileOwnerAsUser(int userHandle) {
+        enforceCrossUsersPermission(userHandle);
+
+        return getProfileOwner(userHandle);
+    }
+
+    @Override
     public ComponentName getProfileOwner(int userHandle) {
         if (!mHasFeature) {
             return null;
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 2f6fca4..ecc13b2 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -67,6 +67,7 @@
 import com.android.server.am.ActivityManagerService;
 import com.android.server.am.ActivityTaskManagerService;
 import com.android.server.audio.AudioService;
+import com.android.server.biometrics.BiometricPromptService;
 import com.android.server.broadcastradio.BroadcastRadioService;
 import com.android.server.camera.CameraServiceProxy;
 import com.android.server.clipboard.ClipboardService;
@@ -888,9 +889,8 @@
             // WMS needs sensor service ready
             ConcurrentUtils.waitForFutureNoInterrupt(mSensorServiceStart, START_SENSOR_SERVICE);
             mSensorServiceStart = null;
-            wm = WindowManagerService.main(context, inputManager,
-                    mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL,
-                    !mFirstBoot, mOnlyCore, new PhoneWindowManager());
+            wm = WindowManagerService.main(context, inputManager, !mFirstBoot, mOnlyCore,
+                    new PhoneWindowManager());
             ServiceManager.addService(Context.WINDOW_SERVICE, wm, /* allowIsolated= */ false,
                     DUMP_FLAG_PRIORITY_CRITICAL | DUMP_FLAG_PROTO);
             ServiceManager.addService(Context.INPUT_SERVICE, inputManager,
@@ -1552,18 +1552,30 @@
             }
             traceEnd();
 
-            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)) {
+            final boolean hasFeatureFace
+                    = mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE);
+            final boolean hasFeatureFingerprint
+                    = mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
+
+            if (hasFeatureFace) {
                 traceBeginAndSlog("StartFaceSensor");
                 mSystemServiceManager.startService(FaceService.class);
                 traceEnd();
             }
 
-            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+            if (hasFeatureFingerprint) {
                 traceBeginAndSlog("StartFingerprintSensor");
                 mSystemServiceManager.startService(FingerprintService.class);
                 traceEnd();
             }
 
+            if (hasFeatureFace || hasFeatureFingerprint) {
+                // Start this service after all biometric services.
+                traceBeginAndSlog("StartBiometricPromptService");
+                mSystemServiceManager.startService(BiometricPromptService.class);
+                traceEnd();
+            }
+
             traceBeginAndSlog("StartBackgroundDexOptService");
             try {
                 BackgroundDexOptService.schedule(context);
diff --git a/services/net/java/android/net/dhcp/DhcpAckPacket.java b/services/net/java/android/net/dhcp/DhcpAckPacket.java
index df44b11..b2eb4e2 100644
--- a/services/net/java/android/net/dhcp/DhcpAckPacket.java
+++ b/services/net/java/android/net/dhcp/DhcpAckPacket.java
@@ -30,8 +30,8 @@
     private final Inet4Address mSrcIp;
 
     DhcpAckPacket(int transId, short secs, boolean broadcast, Inet4Address serverAddress,
-                  Inet4Address clientIp, Inet4Address yourIp, byte[] clientMac) {
-        super(transId, secs, clientIp, yourIp, serverAddress, INADDR_ANY, clientMac, broadcast);
+            Inet4Address relayIp, Inet4Address clientIp, Inet4Address yourIp, byte[] clientMac) {
+        super(transId, secs, clientIp, yourIp, serverAddress, relayIp, clientMac, broadcast);
         mBroadcast = broadcast;
         mSrcIp = serverAddress;
     }
@@ -70,19 +70,8 @@
     void finishPacket(ByteBuffer buffer) {
         addTlv(buffer, DHCP_MESSAGE_TYPE, DHCP_MESSAGE_TYPE_ACK);
         addTlv(buffer, DHCP_SERVER_IDENTIFIER, mServerIdentifier);
-        addTlv(buffer, DHCP_LEASE_TIME, mLeaseTime);
 
-        // the client should renew at 1/2 the lease-expiry interval
-        if (mLeaseTime != null) {
-            addTlv(buffer, DHCP_RENEWAL_TIME,
-                Integer.valueOf(mLeaseTime.intValue() / 2));
-        }
-
-        addTlv(buffer, DHCP_SUBNET_MASK, mSubnetMask);
-        addTlv(buffer, DHCP_ROUTER, mGateways);
-        addTlv(buffer, DHCP_DOMAIN_NAME, mDomainName);
-        addTlv(buffer, DHCP_BROADCAST_ADDRESS, mBroadcastAddress);
-        addTlv(buffer, DHCP_DNS_SERVER, mDnsServers);
+        addCommonServerTlvs(buffer);
         addTlvEnd(buffer);
     }
 
diff --git a/services/net/java/android/net/dhcp/DhcpLease.java b/services/net/java/android/net/dhcp/DhcpLease.java
index d2a15b3..6cdd2aa 100644
--- a/services/net/java/android/net/dhcp/DhcpLease.java
+++ b/services/net/java/android/net/dhcp/DhcpLease.java
@@ -130,9 +130,14 @@
         return HexDump.toHexString(bytes);
     }
 
+    static String inet4AddrToString(@Nullable Inet4Address addr) {
+        return (addr == null) ? "null" : addr.getHostAddress();
+    }
+
     @Override
     public String toString() {
         return String.format("clientId: %s, hwAddr: %s, netAddr: %s, expTime: %d, hostname: %s",
-                clientIdToString(mClientId), mHwAddr.toString(), mNetAddr, mExpTime, mHostname);
+                clientIdToString(mClientId), mHwAddr.toString(), inet4AddrToString(mNetAddr),
+                mExpTime, mHostname);
     }
 }
diff --git a/services/net/java/android/net/dhcp/DhcpLeaseRepository.java b/services/net/java/android/net/dhcp/DhcpLeaseRepository.java
index 7e57c9f..2dda421 100644
--- a/services/net/java/android/net/dhcp/DhcpLeaseRepository.java
+++ b/services/net/java/android/net/dhcp/DhcpLeaseRepository.java
@@ -20,6 +20,7 @@
 import static android.net.NetworkUtils.intToInet4AddressHTH;
 import static android.net.NetworkUtils.prefixLengthToV4NetmaskIntHTH;
 import static android.net.dhcp.DhcpLease.EXPIRATION_NEVER;
+import static android.net.dhcp.DhcpLease.inet4AddrToString;
 import static android.net.util.NetworkConstants.IPV4_ADDR_BITS;
 
 import static java.lang.Math.min;
@@ -29,7 +30,7 @@
 import android.net.IpPrefix;
 import android.net.MacAddress;
 import android.net.util.SharedLog;
-import android.os.SystemClock;
+import android.net.dhcp.DhcpServer.Clock;
 import android.util.ArrayMap;
 
 import java.net.Inet4Address;
@@ -73,15 +74,6 @@
     private int mNumAddresses;
     private long mLeaseTimeMs;
 
-    public static class Clock {
-        /**
-         * @see SystemClock#elapsedRealtime()
-         */
-        public long elapsedRealtime() {
-            return SystemClock.elapsedRealtime();
-        }
-    }
-
     /**
      * Next timestamp when committed or declined leases should be checked for expired ones. This
      * will always be lower than or equal to the time for the first lease to expire: it's OK not to
@@ -107,6 +99,12 @@
         }
     }
 
+    static class InvalidSubnetException extends DhcpLeaseException {
+        InvalidSubnetException(String message) {
+            super(message);
+        }
+    }
+
     /**
      * Leases by IP address
      */
@@ -161,25 +159,17 @@
      * @param reqAddr Requested address by the client (option 50), or {@link #INETADDR_UNSPEC}
      * @param hostname Client-provided hostname, or {@link DhcpLease#HOSTNAME_NONE}
      * @throws OutOfAddressesException The server does not have any available address
-     * @throws InvalidAddressException The lease was requested from an unsupported subnet
+     * @throws InvalidSubnetException The lease was requested from an unsupported subnet
      */
     @NonNull
     public DhcpLease getOffer(@Nullable byte[] clientId, @NonNull MacAddress hwAddr,
-            @NonNull Inet4Address relayAddr,
-            @Nullable Inet4Address reqAddr, @Nullable String hostname)
-            throws OutOfAddressesException, InvalidAddressException {
+            @NonNull Inet4Address relayAddr, @Nullable Inet4Address reqAddr,
+            @Nullable String hostname) throws OutOfAddressesException, InvalidSubnetException {
         final long currentTime = mClock.elapsedRealtime();
         final long expTime = currentTime + mLeaseTimeMs;
 
         removeExpiredLeases(currentTime);
-
-        // As per #4.3.1, addresses are assigned based on the relay address if present. This
-        // implementation only assigns addresses if the relayAddr is inside our configured subnet.
-        // This also applies when the client requested a specific address for consistency between
-        // requests, and with older behavior.
-        if (isIpAddrOutsidePrefix(mPrefix, relayAddr)) {
-            throw new InvalidAddressException("Lease requested by relay from outside of subnet");
-        }
+        checkValidRelayAddr(relayAddr);
 
         final DhcpLease currentLease = findByClient(clientId, hwAddr);
         final DhcpLease newLease;
@@ -197,7 +187,19 @@
         return newLease;
     }
 
-    private static boolean isIpAddrOutsidePrefix(IpPrefix prefix, Inet4Address addr) {
+    private void checkValidRelayAddr(@Nullable Inet4Address relayAddr)
+            throws InvalidSubnetException {
+        // As per #4.3.1, addresses are assigned based on the relay address if present. This
+        // implementation only assigns addresses if the relayAddr is inside our configured subnet.
+        // This also applies when the client requested a specific address for consistency between
+        // requests, and with older behavior.
+        if (isIpAddrOutsidePrefix(mPrefix, relayAddr)) {
+            throw new InvalidSubnetException("Lease requested by relay from outside of subnet");
+        }
+    }
+
+    private static boolean isIpAddrOutsidePrefix(@NonNull IpPrefix prefix,
+            @Nullable Inet4Address addr) {
         return addr != null && !addr.equals(Inet4Address.ANY) && !prefix.contains(addr);
     }
 
@@ -231,10 +233,12 @@
      */
     @NonNull
     public DhcpLease requestLease(@Nullable byte[] clientId, @NonNull MacAddress hwAddr,
-            @NonNull Inet4Address clientAddr, @Nullable Inet4Address reqAddr, boolean sidSet,
-            @Nullable String hostname) throws InvalidAddressException {
+            @NonNull Inet4Address clientAddr, @NonNull Inet4Address relayAddr,
+            @Nullable Inet4Address reqAddr, boolean sidSet, @Nullable String hostname)
+            throws InvalidAddressException, InvalidSubnetException {
         final long currentTime = mClock.elapsedRealtime();
         removeExpiredLeases(currentTime);
+        checkValidRelayAddr(relayAddr);
         final DhcpLease assignedLease = findByClient(clientId, hwAddr);
 
         final Inet4Address leaseAddr = reqAddr != null ? reqAddr : clientAddr;
@@ -261,7 +265,7 @@
         final DhcpLease lease =
                 checkClientAndMakeLease(clientId, hwAddr, leaseAddr, hostname, currentTime);
         mLog.logf("DHCPREQUEST assignedLease %s, reqAddr=%s, sidSet=%s: created/renewed lease %s",
-                assignedLease, reqAddr, sidSet, lease);
+                assignedLease, inet4AddrToString(reqAddr), sidSet, lease);
         return lease;
     }
 
@@ -313,7 +317,7 @@
             @NonNull Inet4Address addr) {
         final DhcpLease currentLease = mCommittedLeases.getOrDefault(addr, null);
         if (currentLease == null) {
-            mLog.w("Could not release unknown lease for " + addr);
+            mLog.w("Could not release unknown lease for " + inet4AddrToString(addr));
             return false;
         }
         if (currentLease.matchesClient(clientId, hwAddr)) {
@@ -328,12 +332,13 @@
 
     public void markLeaseDeclined(@NonNull Inet4Address addr) {
         if (mDeclinedAddrs.containsKey(addr) || !isValidAddress(addr)) {
-            mLog.logf("Not marking %s as declined: already declined or not assignable", addr);
+            mLog.logf("Not marking %s as declined: already declined or not assignable",
+                    inet4AddrToString(addr));
             return;
         }
         final long expTime = mClock.elapsedRealtime() + mLeaseTimeMs;
         mDeclinedAddrs.put(addr, expTime);
-        mLog.logf("Marked %s as declined expiring %d", addr, expTime);
+        mLog.logf("Marked %s as declined expiring %d", inet4AddrToString(addr), expTime);
         maybeUpdateEarliestExpiration(expTime);
     }
 
@@ -524,7 +529,8 @@
         while (it.hasNext()) {
             final Inet4Address addr = it.next();
             it.remove();
-            mLog.logf("Out of addresses in address pool: dropped declined addr %s", addr);
+            mLog.logf("Out of addresses in address pool: dropped declined addr %s",
+                    inet4AddrToString(addr));
             // isValidAddress() is always verified for entries in mDeclinedAddrs.
             // However declined addresses may have been requested (typically by the machine that was
             // already using the address) after being declined.
diff --git a/services/net/java/android/net/dhcp/DhcpNakPacket.java b/services/net/java/android/net/dhcp/DhcpNakPacket.java
index ef9af52..1da0b73 100644
--- a/services/net/java/android/net/dhcp/DhcpNakPacket.java
+++ b/services/net/java/android/net/dhcp/DhcpNakPacket.java
@@ -26,9 +26,10 @@
     /**
      * Generates a NAK packet with the specified parameters.
      */
-    DhcpNakPacket(int transId, short secs, Inet4Address nextIp, Inet4Address relayIp,
-            byte[] clientMac, boolean broadcast) {
-        super(transId, secs, INADDR_ANY, INADDR_ANY, nextIp, relayIp, clientMac, broadcast);
+    DhcpNakPacket(int transId, short secs, Inet4Address relayIp, byte[] clientMac,
+            boolean broadcast) {
+        super(transId, secs, INADDR_ANY /* clientIp */, INADDR_ANY /* yourIp */,
+                INADDR_ANY /* nextIp */, relayIp, clientMac, broadcast);
     }
 
     public String toString() {
diff --git a/services/net/java/android/net/dhcp/DhcpOfferPacket.java b/services/net/java/android/net/dhcp/DhcpOfferPacket.java
index 99154ef..0eba77e 100644
--- a/services/net/java/android/net/dhcp/DhcpOfferPacket.java
+++ b/services/net/java/android/net/dhcp/DhcpOfferPacket.java
@@ -32,8 +32,8 @@
      * Generates a OFFER packet with the specified parameters.
      */
     DhcpOfferPacket(int transId, short secs, boolean broadcast, Inet4Address serverAddress,
-                    Inet4Address clientIp, Inet4Address yourIp, byte[] clientMac) {
-        super(transId, secs, clientIp, yourIp, INADDR_ANY, INADDR_ANY, clientMac, broadcast);
+            Inet4Address relayIp, Inet4Address clientIp, Inet4Address yourIp, byte[] clientMac) {
+        super(transId, secs, clientIp, yourIp, serverAddress, relayIp, clientMac, broadcast);
         mSrcIp = serverAddress;
     }
 
@@ -72,19 +72,8 @@
     void finishPacket(ByteBuffer buffer) {
         addTlv(buffer, DHCP_MESSAGE_TYPE, DHCP_MESSAGE_TYPE_OFFER);
         addTlv(buffer, DHCP_SERVER_IDENTIFIER, mServerIdentifier);
-        addTlv(buffer, DHCP_LEASE_TIME, mLeaseTime);
 
-        // the client should renew at 1/2 the lease-expiry interval
-        if (mLeaseTime != null) {
-            addTlv(buffer, DHCP_RENEWAL_TIME,
-                Integer.valueOf(mLeaseTime.intValue() / 2));
-        }
-
-        addTlv(buffer, DHCP_SUBNET_MASK, mSubnetMask);
-        addTlv(buffer, DHCP_ROUTER, mGateways);
-        addTlv(buffer, DHCP_DOMAIN_NAME, mDomainName);
-        addTlv(buffer, DHCP_BROADCAST_ADDRESS, mBroadcastAddress);
-        addTlv(buffer, DHCP_DNS_SERVER, mDnsServers);
+        addCommonServerTlvs(buffer);
         addTlvEnd(buffer);
     }
 }
diff --git a/services/net/java/android/net/dhcp/DhcpPacket.java b/services/net/java/android/net/dhcp/DhcpPacket.java
index 888821a..77a3e21 100644
--- a/services/net/java/android/net/dhcp/DhcpPacket.java
+++ b/services/net/java/android/net/dhcp/DhcpPacket.java
@@ -9,6 +9,7 @@
 import android.os.SystemProperties;
 import android.system.OsConstants;
 import android.text.TextUtils;
+
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.UnsupportedEncodingException;
@@ -183,6 +184,11 @@
     protected String mVendorInfo;
 
     /**
+     * Value of the vendor specific option used to indicate that the network is metered
+     */
+    public static final String VENDOR_INFO_ANDROID_METERED = "ANDROID_METERED";
+
+    /**
      * DHCP Optional Type: DHCP Requested IP Address
      */
     protected static final byte DHCP_REQUESTED_IP = 50;
@@ -351,6 +357,14 @@
     }
 
     /**
+     * Convenience method to return the client ID if it was set explicitly, or null otherwise.
+     */
+    @Nullable
+    public byte[] getExplicitClientIdOrNull() {
+        return hasExplicitClientId() ? getClientId() : null;
+    }
+
+    /**
      * Returns the client ID. If not set explicitly, this follows RFC 2132 and creates a client ID
      * based on the hardware address.
      */
@@ -668,6 +682,23 @@
         if (!TextUtils.isEmpty(hn)) addTlv(buf, DHCP_HOST_NAME, hn);
     }
 
+    protected void addCommonServerTlvs(ByteBuffer buf) {
+        addTlv(buf, DHCP_LEASE_TIME, mLeaseTime);
+        if (mLeaseTime != null && mLeaseTime != INFINITE_LEASE) {
+            // The client should renew at 1/2 the lease-expiry interval
+            addTlv(buf, DHCP_RENEWAL_TIME, (int) (Integer.toUnsignedLong(mLeaseTime) / 2));
+            // Default rebinding time is set as below by RFC2131
+            addTlv(buf, DHCP_REBINDING_TIME,
+                    (int) (Integer.toUnsignedLong(mLeaseTime) * 875L / 1000L));
+        }
+        addTlv(buf, DHCP_SUBNET_MASK, mSubnetMask);
+        addTlv(buf, DHCP_BROADCAST_ADDRESS, mBroadcastAddress);
+        addTlv(buf, DHCP_ROUTER, mGateways);
+        addTlv(buf, DHCP_DNS_SERVER, mDnsServers);
+        addTlv(buf, DHCP_DOMAIN_NAME, mDomainName);
+        addTlv(buf, DHCP_VENDOR_INFO, mVendorInfo);
+    }
+
     /**
      * Converts a MAC from an array of octets to an ASCII string.
      */
@@ -1076,7 +1107,7 @@
                 break;
             case DHCP_MESSAGE_TYPE_OFFER:
                 newPacket = new DhcpOfferPacket(
-                    transactionId, secs, broadcast, ipSrc, clientIp, yourIp, clientMac);
+                    transactionId, secs, broadcast, ipSrc, relayIp, clientIp, yourIp, clientMac);
                 break;
             case DHCP_MESSAGE_TYPE_REQUEST:
                 newPacket = new DhcpRequestPacket(
@@ -1089,11 +1120,11 @@
                 break;
             case DHCP_MESSAGE_TYPE_ACK:
                 newPacket = new DhcpAckPacket(
-                    transactionId, secs, broadcast, ipSrc, clientIp, yourIp, clientMac);
+                    transactionId, secs, broadcast, ipSrc, relayIp, clientIp, yourIp, clientMac);
                 break;
             case DHCP_MESSAGE_TYPE_NAK:
                 newPacket = new DhcpNakPacket(
-                        transactionId, secs, nextIp, relayIp, clientMac, broadcast);
+                        transactionId, secs, relayIp, clientMac, broadcast);
                 break;
             case DHCP_MESSAGE_TYPE_RELEASE:
                 if (serverIdentifier == null) {
@@ -1225,12 +1256,13 @@
      * parameters.
      */
     public static ByteBuffer buildOfferPacket(int encap, int transactionId,
-        boolean broadcast, Inet4Address serverIpAddr, Inet4Address clientIpAddr,
-        byte[] mac, Integer timeout, Inet4Address netMask, Inet4Address bcAddr,
-        List<Inet4Address> gateways, List<Inet4Address> dnsServers,
-        Inet4Address dhcpServerIdentifier, String domainName) {
+        boolean broadcast, Inet4Address serverIpAddr, Inet4Address relayIp,
+        Inet4Address yourIp, byte[] mac, Integer timeout, Inet4Address netMask,
+        Inet4Address bcAddr, List<Inet4Address> gateways, List<Inet4Address> dnsServers,
+        Inet4Address dhcpServerIdentifier, String domainName, boolean metered) {
         DhcpPacket pkt = new DhcpOfferPacket(
-            transactionId, (short) 0, broadcast, serverIpAddr, INADDR_ANY, clientIpAddr, mac);
+                transactionId, (short) 0, broadcast, serverIpAddr, relayIp,
+                INADDR_ANY /* clientIp */, yourIp, mac);
         pkt.mGateways = gateways;
         pkt.mDnsServers = dnsServers;
         pkt.mLeaseTime = timeout;
@@ -1238,6 +1270,9 @@
         pkt.mServerIdentifier = dhcpServerIdentifier;
         pkt.mSubnetMask = netMask;
         pkt.mBroadcastAddress = bcAddr;
+        if (metered) {
+            pkt.mVendorInfo = VENDOR_INFO_ANDROID_METERED;
+        }
         return pkt.buildPacket(encap, DHCP_CLIENT, DHCP_SERVER);
     }
 
@@ -1245,12 +1280,13 @@
      * Builds a DHCP-ACK packet from the required specified parameters.
      */
     public static ByteBuffer buildAckPacket(int encap, int transactionId,
-        boolean broadcast, Inet4Address serverIpAddr, Inet4Address clientIpAddr,
-        byte[] mac, Integer timeout, Inet4Address netMask, Inet4Address bcAddr,
-        List<Inet4Address> gateways, List<Inet4Address> dnsServers,
-        Inet4Address dhcpServerIdentifier, String domainName) {
+        boolean broadcast, Inet4Address serverIpAddr, Inet4Address relayIp, Inet4Address yourIp,
+        Inet4Address requestClientIp, byte[] mac, Integer timeout, Inet4Address netMask,
+        Inet4Address bcAddr, List<Inet4Address> gateways, List<Inet4Address> dnsServers,
+        Inet4Address dhcpServerIdentifier, String domainName, boolean metered) {
         DhcpPacket pkt = new DhcpAckPacket(
-            transactionId, (short) 0, broadcast, serverIpAddr, INADDR_ANY, clientIpAddr, mac);
+                transactionId, (short) 0, broadcast, serverIpAddr, relayIp, requestClientIp, yourIp,
+                mac);
         pkt.mGateways = gateways;
         pkt.mDnsServers = dnsServers;
         pkt.mLeaseTime = timeout;
@@ -1258,6 +1294,9 @@
         pkt.mSubnetMask = netMask;
         pkt.mServerIdentifier = dhcpServerIdentifier;
         pkt.mBroadcastAddress = bcAddr;
+        if (metered) {
+            pkt.mVendorInfo = VENDOR_INFO_ANDROID_METERED;
+        }
         return pkt.buildPacket(encap, DHCP_CLIENT, DHCP_SERVER);
     }
 
@@ -1265,10 +1304,11 @@
      * Builds a DHCP-NAK packet from the required specified parameters.
      */
     public static ByteBuffer buildNakPacket(int encap, int transactionId, Inet4Address serverIpAddr,
-            byte[] mac, boolean broadcast, String message) {
+            Inet4Address relayIp, byte[] mac, boolean broadcast, String message) {
         DhcpPacket pkt = new DhcpNakPacket(
-                transactionId, (short) 0, serverIpAddr, serverIpAddr, mac, broadcast);
+                transactionId, (short) 0, relayIp, mac, broadcast);
         pkt.mMessage = message;
+        pkt.mServerIdentifier = serverIpAddr;
         return pkt.buildPacket(encap, DHCP_CLIENT, DHCP_SERVER);
     }
 
diff --git a/services/net/java/android/net/dhcp/DhcpPacketListener.java b/services/net/java/android/net/dhcp/DhcpPacketListener.java
index 498fd93..6f620c5 100644
--- a/services/net/java/android/net/dhcp/DhcpPacketListener.java
+++ b/services/net/java/android/net/dhcp/DhcpPacketListener.java
@@ -16,15 +16,14 @@
 
 package android.net.dhcp;
 
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.net.util.FdEventsReader;
-import android.net.util.PacketReader;
 import android.os.Handler;
 import android.system.Os;
 
 import java.io.FileDescriptor;
 import java.net.Inet4Address;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
 /**
@@ -35,19 +34,20 @@
     static final class Payload {
         final byte[] bytes = new byte[DhcpPacket.MAX_LENGTH];
         Inet4Address srcAddr;
+        int srcPort;
     }
 
-    public DhcpPacketListener(Handler handler) {
+    public DhcpPacketListener(@NonNull Handler handler) {
         super(handler, new Payload());
     }
 
     @Override
-    protected int recvBufSize(Payload buffer) {
+    protected int recvBufSize(@NonNull Payload buffer) {
         return buffer.bytes.length;
     }
 
     @Override
-    protected final void handlePacket(Payload recvbuf, int length) {
+    protected final void handlePacket(@NonNull Payload recvbuf, int length) {
         if (recvbuf.srcAddr == null) {
             return;
         }
@@ -55,30 +55,34 @@
         try {
             final DhcpPacket packet = DhcpPacket.decodeFullPacket(recvbuf.bytes, length,
                     DhcpPacket.ENCAP_BOOTP);
-            onReceive(packet, recvbuf.srcAddr);
+            onReceive(packet, recvbuf.srcAddr, recvbuf.srcPort);
         } catch (DhcpPacket.ParseException e) {
             logParseError(recvbuf.bytes, length, e);
         }
     }
 
     @Override
-    protected int readPacket(FileDescriptor fd, Payload packetBuffer) throws Exception {
+    protected int readPacket(@NonNull FileDescriptor fd, @NonNull Payload packetBuffer)
+            throws Exception {
         final InetSocketAddress addr = new InetSocketAddress();
         final int read = Os.recvfrom(
                 fd, packetBuffer.bytes, 0, packetBuffer.bytes.length, 0 /* flags */, addr);
 
         // Buffers with null srcAddr will be dropped in handlePacket()
         packetBuffer.srcAddr = inet4AddrOrNull(addr);
+        packetBuffer.srcPort = addr.getPort();
         return read;
     }
 
     @Nullable
-    private static Inet4Address inet4AddrOrNull(InetSocketAddress addr) {
+    private static Inet4Address inet4AddrOrNull(@NonNull InetSocketAddress addr) {
         return addr.getAddress() instanceof Inet4Address
                 ? (Inet4Address) addr.getAddress()
                 : null;
     }
 
-    protected abstract void onReceive(DhcpPacket packet, Inet4Address srcAddr);
-    protected abstract void logParseError(byte[] packet, int length, DhcpPacket.ParseException e);
+    protected abstract void onReceive(@NonNull DhcpPacket packet, @NonNull Inet4Address srcAddr,
+            int srcPort);
+    protected abstract void logParseError(@NonNull byte[] packet, int length,
+            @NonNull DhcpPacket.ParseException e);
 }
diff --git a/services/net/java/android/net/dhcp/DhcpServer.java b/services/net/java/android/net/dhcp/DhcpServer.java
new file mode 100644
index 0000000..2b3d577
--- /dev/null
+++ b/services/net/java/android/net/dhcp/DhcpServer.java
@@ -0,0 +1,525 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.dhcp;
+
+import static android.net.NetworkUtils.getBroadcastAddress;
+import static android.net.NetworkUtils.getPrefixMaskAsInet4Address;
+import static android.net.TrafficStats.TAG_SYSTEM_DHCP_SERVER;
+import static android.net.dhcp.DhcpPacket.DHCP_CLIENT;
+import static android.net.dhcp.DhcpPacket.DHCP_SERVER;
+import static android.net.dhcp.DhcpPacket.ENCAP_BOOTP;
+import static android.net.dhcp.DhcpPacket.INFINITE_LEASE;
+import static android.system.OsConstants.AF_INET;
+import static android.system.OsConstants.IPPROTO_UDP;
+import static android.system.OsConstants.SOCK_DGRAM;
+import static android.system.OsConstants.SOL_SOCKET;
+import static android.system.OsConstants.SO_BINDTODEVICE;
+import static android.system.OsConstants.SO_BROADCAST;
+import static android.system.OsConstants.SO_REUSEADDR;
+
+import static java.lang.Integer.toUnsignedLong;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.net.MacAddress;
+import android.net.NetworkUtils;
+import android.net.TrafficStats;
+import android.net.util.InterfaceParams;
+import android.net.util.SharedLog;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.os.SystemClock;
+import android.system.ErrnoException;
+import android.system.Os;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.HexDump;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+
+/**
+ * A DHCPv4 server.
+ *
+ * <p>This server listens for and responds to packets on a single interface. It considers itself
+ * authoritative for all leases on the subnet, which means that DHCP requests for unknown leases of
+ * unknown hosts receive a reply instead of being ignored.
+ *
+ * <p>The server is single-threaded (including send/receive operations): all internal operations are
+ * done on the provided {@link Looper}. Public methods are thread-safe and will schedule operations
+ * on the looper asynchronously.
+ * @hide
+ */
+public class DhcpServer {
+    private static final String REPO_TAG = "Repository";
+
+    // Lease time to transmit to client instead of a negative time in case a lease expired before
+    // the server could send it (if the server process is suspended for example).
+    private static final int EXPIRED_FALLBACK_LEASE_TIME_SECS = 120;
+
+    private static final int CMD_START_DHCP_SERVER = 1;
+    private static final int CMD_STOP_DHCP_SERVER = 2;
+    private static final int CMD_UPDATE_PARAMS = 3;
+
+    @NonNull
+    private final ServerHandler mHandler;
+    @NonNull
+    private final InterfaceParams mIface;
+    @NonNull
+    private final DhcpLeaseRepository mLeaseRepo;
+    @NonNull
+    private final SharedLog mLog;
+    @NonNull
+    private final Dependencies mDeps;
+    @NonNull
+    private final Clock mClock;
+    @NonNull
+    private final DhcpPacketListener mPacketListener;
+
+    @Nullable
+    private FileDescriptor mSocket;
+    @NonNull
+    private DhcpServingParams mServingParams;
+
+    public static class Clock {
+        /**
+         * @see SystemClock#elapsedRealtime()
+         */
+        public long elapsedRealtime() {
+            return SystemClock.elapsedRealtime();
+        }
+    }
+
+    public interface Dependencies {
+        void sendPacket(@NonNull FileDescriptor fd, @NonNull ByteBuffer buffer,
+                @NonNull InetAddress dst) throws ErrnoException, IOException;
+        DhcpLeaseRepository makeLeaseRepository(@NonNull DhcpServingParams servingParams,
+                @NonNull SharedLog log, @NonNull Clock clock);
+        DhcpPacketListener makePacketListener();
+        Clock makeClock();
+        void addArpEntry(@NonNull Inet4Address ipv4Addr, @NonNull MacAddress ethAddr,
+                @NonNull String ifname, @NonNull FileDescriptor fd) throws IOException;
+    }
+
+    private class DependenciesImpl implements Dependencies {
+        @Override
+        public void sendPacket(@NonNull FileDescriptor fd, @NonNull ByteBuffer buffer,
+                @NonNull InetAddress dst) throws ErrnoException, IOException {
+            Os.sendto(fd, buffer, 0, dst, DhcpPacket.DHCP_CLIENT);
+        }
+
+        @Override
+        public DhcpLeaseRepository makeLeaseRepository(@NonNull DhcpServingParams servingParams,
+                @NonNull SharedLog log, @NonNull Clock clock) {
+            return new DhcpLeaseRepository(
+                    DhcpServingParams.makeIpPrefix(servingParams.serverAddr),
+                    servingParams.excludedAddrs,
+                    servingParams.dhcpLeaseTimeSecs*1000, log.forSubComponent(REPO_TAG), clock);
+        }
+
+        @Override
+        public DhcpPacketListener makePacketListener() {
+            return new PacketListener();
+        }
+
+        @Override
+        public Clock makeClock() {
+            return new Clock();
+        }
+
+        @Override
+        public void addArpEntry(@NonNull Inet4Address ipv4Addr, @NonNull MacAddress ethAddr,
+                @NonNull String ifname, @NonNull FileDescriptor fd) throws IOException {
+            NetworkUtils.addArpEntry(ipv4Addr, ethAddr, ifname, fd);
+        }
+    }
+
+    private static class MalformedPacketException extends Exception {
+        MalformedPacketException(String message, Throwable t) {
+            super(message, t);
+        }
+    }
+
+    public DhcpServer(@NonNull Looper looper, @NonNull InterfaceParams iface,
+            @NonNull DhcpServingParams params, @NonNull SharedLog log) {
+        this(looper, iface, params, log, null);
+    }
+
+    @VisibleForTesting
+    DhcpServer(@NonNull Looper looper, @NonNull InterfaceParams iface,
+            @NonNull DhcpServingParams params, @NonNull SharedLog log,
+            @Nullable Dependencies deps) {
+        if (deps == null) {
+            deps = new DependenciesImpl();
+        }
+        mHandler = new ServerHandler(looper);
+        mIface = iface;
+        mServingParams = params;
+        mLog = log;
+        mDeps = deps;
+        mClock = deps.makeClock();
+        mPacketListener = deps.makePacketListener();
+        mLeaseRepo = deps.makeLeaseRepository(mServingParams, mLog, mClock);
+    }
+
+    /**
+     * Start listening for and responding to packets.
+     */
+    public void start() {
+        mHandler.sendEmptyMessage(CMD_START_DHCP_SERVER);
+    }
+
+    /**
+     * Update serving parameters. All subsequently received requests will be handled with the new
+     * parameters, and current leases that are incompatible with the new parameters are dropped.
+     */
+    public void updateParams(@NonNull DhcpServingParams params) {
+        sendMessage(CMD_UPDATE_PARAMS, params);
+    }
+
+    /**
+     * Stop listening for packets.
+     *
+     * <p>As the server is stopped asynchronously, some packets may still be processed shortly after
+     * calling this method.
+     */
+    public void stop() {
+        mHandler.sendEmptyMessage(CMD_STOP_DHCP_SERVER);
+    }
+
+    private void sendMessage(int what, @Nullable Object obj) {
+        mHandler.sendMessage(mHandler.obtainMessage(what, obj));
+    }
+
+    private class ServerHandler extends Handler {
+        public ServerHandler(@NonNull Looper looper) {
+            super(looper);
+        }
+
+        @Override
+        public void handleMessage(@NonNull Message msg) {
+            switch (msg.what) {
+                case CMD_UPDATE_PARAMS:
+                    final DhcpServingParams params = (DhcpServingParams) msg.obj;
+                    mServingParams = params;
+                    mLeaseRepo.updateParams(
+                            DhcpServingParams.makeIpPrefix(mServingParams.serverAddr),
+                            params.excludedAddrs,
+                            params.dhcpLeaseTimeSecs);
+                    break;
+                case CMD_START_DHCP_SERVER:
+                    // This is a no-op if the listener is already started
+                    mPacketListener.start();
+                    break;
+                case CMD_STOP_DHCP_SERVER:
+                    // This is a no-op if the listener was not started
+                    mPacketListener.stop();
+                    break;
+            }
+        }
+    }
+
+    @VisibleForTesting
+    void processPacket(@NonNull DhcpPacket packet, int srcPort) {
+        final String packetType = packet.getClass().getSimpleName();
+        if (srcPort != DHCP_CLIENT) {
+            mLog.logf("Ignored packet of type %s sent from client port %d", packetType, srcPort);
+            return;
+        }
+
+        mLog.log("Received packet of type " + packetType);
+        final Inet4Address sid = packet.mServerIdentifier;
+        if (sid != null && !sid.equals(mServingParams.serverAddr.getAddress())) {
+            mLog.log("Packet ignored due to wrong server identifier: " + sid);
+            return;
+        }
+
+        try {
+            if (packet instanceof DhcpDiscoverPacket) {
+                processDiscover((DhcpDiscoverPacket) packet);
+            } else if (packet instanceof DhcpRequestPacket) {
+                processRequest((DhcpRequestPacket) packet);
+            } else if (packet instanceof DhcpReleasePacket) {
+                processRelease((DhcpReleasePacket) packet);
+            } else {
+                mLog.e("Unknown packet type: " + packet.getClass().getSimpleName());
+            }
+        } catch (MalformedPacketException e) {
+            // Not an internal error: only logging exception message, not stacktrace
+            mLog.e("Ignored malformed packet: " + e.getMessage());
+        }
+    }
+
+    private void logIgnoredPacketInvalidSubnet(DhcpLeaseRepository.InvalidSubnetException e) {
+        // Not an internal error: only logging exception message, not stacktrace
+        mLog.e("Ignored packet from invalid subnet: " + e.getMessage());
+    }
+
+    private void processDiscover(@NonNull DhcpDiscoverPacket packet)
+            throws MalformedPacketException {
+        final DhcpLease lease;
+        final MacAddress clientMac = getMacAddr(packet);
+        try {
+            lease = mLeaseRepo.getOffer(packet.getExplicitClientIdOrNull(), clientMac,
+                    packet.mRelayIp, packet.mRequestedIp, packet.mHostName);
+        } catch (DhcpLeaseRepository.OutOfAddressesException e) {
+            transmitNak(packet, "Out of addresses to offer");
+            return;
+        } catch (DhcpLeaseRepository.InvalidSubnetException e) {
+            logIgnoredPacketInvalidSubnet(e);
+            return;
+        }
+
+        transmitOffer(packet, lease, clientMac);
+    }
+
+    private void processRequest(@NonNull DhcpRequestPacket packet) throws MalformedPacketException {
+        // If set, packet SID matches with this server's ID as checked in processPacket().
+        final boolean sidSet = packet.mServerIdentifier != null;
+        final DhcpLease lease;
+        final MacAddress clientMac = getMacAddr(packet);
+        try {
+            lease = mLeaseRepo.requestLease(packet.getExplicitClientIdOrNull(), clientMac,
+                    packet.mClientIp, packet.mRelayIp, packet.mRequestedIp, sidSet,
+                    packet.mHostName);
+        } catch (DhcpLeaseRepository.InvalidAddressException e) {
+            transmitNak(packet, "Invalid requested address");
+            return;
+        } catch (DhcpLeaseRepository.InvalidSubnetException e) {
+            logIgnoredPacketInvalidSubnet(e);
+            return;
+        }
+
+        transmitAck(packet, lease, clientMac);
+    }
+
+    private void processRelease(@NonNull DhcpReleasePacket packet)
+            throws MalformedPacketException {
+        final byte[] clientId = packet.getExplicitClientIdOrNull();
+        final MacAddress macAddr = getMacAddr(packet);
+        // Don't care about success (there is no ACK/NAK); logging is already done in the repository
+        mLeaseRepo.releaseLease(clientId, macAddr, packet.mClientIp);
+    }
+
+    private Inet4Address getAckOrOfferDst(@NonNull DhcpPacket request, @NonNull DhcpLease lease,
+            boolean broadcastFlag) {
+        // Unless relayed or broadcast, send to client IP if already configured on the client, or to
+        // the lease address if the client has no configured address
+        if (!isEmpty(request.mRelayIp)) {
+            return request.mRelayIp;
+        } else if (broadcastFlag) {
+            return (Inet4Address) Inet4Address.ALL;
+        } else if (!isEmpty(request.mClientIp)) {
+            return request.mClientIp;
+        } else {
+            return lease.getNetAddr();
+        }
+    }
+
+    /**
+     * Determine whether the broadcast flag should be set in the BOOTP packet flags. This does not
+     * apply to NAK responses, which should always have it set.
+     */
+    private static boolean getBroadcastFlag(@NonNull DhcpPacket request, @NonNull DhcpLease lease) {
+        // No broadcast flag if the client already has a configured IP to unicast to. RFC2131 #4.1
+        // has some contradictions regarding broadcast behavior if a client already has an IP
+        // configured and sends a request with both ciaddr (renew/rebind) and the broadcast flag
+        // set. Sending a unicast response to ciaddr matches previous behavior and is more
+        // efficient.
+        // If the client has no configured IP, broadcast if requested by the client or if the lease
+        // address cannot be used to send a unicast reply either.
+        return isEmpty(request.mClientIp) && (request.mBroadcast || isEmpty(lease.getNetAddr()));
+    }
+
+    private boolean transmitOffer(@NonNull DhcpPacket request, @NonNull DhcpLease lease,
+            @NonNull MacAddress clientMac) {
+        final boolean broadcastFlag = getBroadcastFlag(request, lease);
+        final int timeout = getLeaseTimeout(lease);
+        final Inet4Address prefixMask =
+                getPrefixMaskAsInet4Address(mServingParams.serverAddr.getPrefixLength());
+        final Inet4Address broadcastAddr = getBroadcastAddress(
+                mServingParams.getServerInet4Addr(), mServingParams.serverAddr.getPrefixLength());
+        final ByteBuffer offerPacket = DhcpPacket.buildOfferPacket(
+                ENCAP_BOOTP, request.mTransId, broadcastFlag, mServingParams.getServerInet4Addr(),
+                request.mRelayIp, lease.getNetAddr(), request.mClientMac, timeout, prefixMask,
+                broadcastAddr, new ArrayList<>(mServingParams.defaultRouters),
+                new ArrayList<>(mServingParams.dnsServers),
+                mServingParams.getServerInet4Addr(), null /* domainName */, mServingParams.metered);
+
+        return transmitOfferOrAckPacket(offerPacket, request, lease, clientMac, broadcastFlag);
+    }
+
+    private boolean transmitAck(@NonNull DhcpPacket request, @NonNull DhcpLease lease,
+            @NonNull MacAddress clientMac) {
+        // TODO: replace DhcpPacket's build methods with real builders and use common code with
+        // transmitOffer above
+        final boolean broadcastFlag = getBroadcastFlag(request, lease);
+        final int timeout = getLeaseTimeout(lease);
+        final ByteBuffer ackPacket = DhcpPacket.buildAckPacket(ENCAP_BOOTP, request.mTransId,
+                broadcastFlag, mServingParams.getServerInet4Addr(), request.mRelayIp,
+                lease.getNetAddr(), request.mClientIp, request.mClientMac, timeout,
+                mServingParams.getPrefixMaskAsAddress(), mServingParams.getBroadcastAddress(),
+                new ArrayList<>(mServingParams.defaultRouters),
+                new ArrayList<>(mServingParams.dnsServers),
+                mServingParams.getServerInet4Addr(), null /* domainName */, mServingParams.metered);
+
+        return transmitOfferOrAckPacket(ackPacket, request, lease, clientMac, broadcastFlag);
+    }
+
+    private boolean transmitNak(DhcpPacket request, String message) {
+        mLog.w("Transmitting NAK: " + message);
+        // Always set broadcast flag for NAK: client may not have a correct IP
+        final ByteBuffer nakPacket = DhcpPacket.buildNakPacket(
+                ENCAP_BOOTP, request.mTransId, mServingParams.getServerInet4Addr(),
+                request.mRelayIp, request.mClientMac, true /* broadcast */, message);
+
+        final Inet4Address dst = isEmpty(request.mRelayIp)
+                ? (Inet4Address) Inet4Address.ALL
+                : request.mRelayIp;
+        return transmitPacket(nakPacket, DhcpNakPacket.class.getSimpleName(), dst);
+    }
+
+    private boolean transmitOfferOrAckPacket(@NonNull ByteBuffer buf, @NonNull DhcpPacket request,
+            @NonNull DhcpLease lease, @NonNull MacAddress clientMac, boolean broadcastFlag) {
+        mLog.logf("Transmitting %s with lease %s", request.getClass().getSimpleName(), lease);
+        // Client may not yet respond to ARP for the lease address, which may be the destination
+        // address. Add an entry to the ARP cache to save future ARP probes and make sure the
+        // packet reaches its destination.
+        if (!addArpEntry(clientMac, lease.getNetAddr())) {
+            // Logging for error already done
+            return false;
+        }
+        final Inet4Address dst = getAckOrOfferDst(request, lease, broadcastFlag);
+        return transmitPacket(buf, request.getClass().getSimpleName(), dst);
+    }
+
+    private boolean transmitPacket(@NonNull ByteBuffer buf, @NonNull String packetTypeTag,
+            @NonNull Inet4Address dst) {
+        try {
+            mDeps.sendPacket(mSocket, buf, dst);
+        } catch (ErrnoException | IOException e) {
+            mLog.e("Can't send packet " + packetTypeTag, e);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean addArpEntry(@NonNull MacAddress macAddr, @NonNull Inet4Address inetAddr) {
+        try {
+            mDeps.addArpEntry(inetAddr, macAddr, mIface.name, mSocket);
+            return true;
+        } catch (IOException e) {
+            mLog.e("Error adding client to ARP table", e);
+            return false;
+        }
+    }
+
+    /**
+     * Get the remaining lease time in seconds, starting from {@link Clock#elapsedRealtime()}.
+     *
+     * <p>This is an unsigned 32-bit integer, so it cannot be read as a standard (signed) Java int.
+     * The return value is only intended to be used to populate the lease time field in a DHCP
+     * response, considering that lease time is an unsigned 32-bit integer field in DHCP packets.
+     *
+     * <p>Lease expiration times are tracked internally with millisecond precision: this method
+     * returns a rounded down value.
+     */
+    private int getLeaseTimeout(@NonNull DhcpLease lease) {
+        final long remainingTimeSecs = (lease.getExpTime() - mClock.elapsedRealtime()) / 1000;
+        if (remainingTimeSecs < 0) {
+            mLog.e("Processing expired lease " + lease);
+            return EXPIRED_FALLBACK_LEASE_TIME_SECS;
+        }
+
+        if (remainingTimeSecs >= toUnsignedLong(INFINITE_LEASE)) {
+            return INFINITE_LEASE;
+        }
+
+        return (int) remainingTimeSecs;
+    }
+
+    /**
+     * Get the client MAC address from a packet.
+     *
+     * @throws MalformedPacketException The address in the packet uses an unsupported format.
+     */
+    @NonNull
+    private MacAddress getMacAddr(@NonNull DhcpPacket packet) throws MalformedPacketException {
+        try {
+            return MacAddress.fromBytes(packet.getClientMac());
+        } catch (IllegalArgumentException e) {
+            final String message = "Invalid MAC address in packet: "
+                    + HexDump.dumpHexString(packet.getClientMac());
+            throw new MalformedPacketException(message, e);
+        }
+    }
+
+    private static boolean isEmpty(@Nullable Inet4Address address) {
+        return address == null || Inet4Address.ANY.equals(address);
+    }
+
+    private class PacketListener extends DhcpPacketListener {
+        public PacketListener() {
+            super(mHandler);
+        }
+
+        @Override
+        protected void onReceive(DhcpPacket packet, Inet4Address srcAddr, int srcPort) {
+            processPacket(packet, srcPort);
+        }
+
+        @Override
+        protected void logError(String msg, Exception e) {
+            mLog.e("Error receiving packet: " + msg, e);
+        }
+
+        @Override
+        protected void logParseError(byte[] packet, int length, DhcpPacket.ParseException e) {
+            mLog.e("Error parsing packet", e);
+        }
+
+        @Override
+        protected FileDescriptor createFd() {
+            // TODO: have and use an API to set a socket tag without going through the thread tag
+            final int oldTag = TrafficStats.getAndSetThreadStatsTag(TAG_SYSTEM_DHCP_SERVER);
+            try {
+                mSocket = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+                Os.setsockoptInt(mSocket, SOL_SOCKET, SO_REUSEADDR, 1);
+                // SO_BINDTODEVICE actually takes a string. This works because the first member
+                // of struct ifreq is a NULL-terminated interface name.
+                // TODO: add a setsockoptString()
+                Os.setsockoptIfreq(mSocket, SOL_SOCKET, SO_BINDTODEVICE, mIface.name);
+                Os.setsockoptInt(mSocket, SOL_SOCKET, SO_BROADCAST, 1);
+                Os.bind(mSocket, Inet4Address.ANY, DHCP_SERVER);
+                NetworkUtils.protectFromVpn(mSocket);
+
+                return mSocket;
+            } catch (IOException | ErrnoException e) {
+                mLog.e("Error creating UDP socket", e);
+                DhcpServer.this.stop();
+                return null;
+            } finally {
+                TrafficStats.setThreadStatsTag(oldTag);
+            }
+        }
+    }
+}
diff --git a/services/net/java/android/net/dhcp/DhcpServingParams.java b/services/net/java/android/net/dhcp/DhcpServingParams.java
index ba9d116..df15ba1 100644
--- a/services/net/java/android/net/dhcp/DhcpServingParams.java
+++ b/services/net/java/android/net/dhcp/DhcpServingParams.java
@@ -28,6 +28,8 @@
 import android.net.LinkAddress;
 import android.net.NetworkUtils;
 
+import com.google.android.collect.Sets;
+
 import java.net.Inet4Address;
 import java.util.Collections;
 import java.util.HashSet;
@@ -74,6 +76,11 @@
     public final int linkMtu;
 
     /**
+     * Indicates whether the DHCP server should send the ANDROID_METERED vendor-specific option.
+     */
+    public final boolean metered;
+
+    /**
      * Checked exception thrown when some parameters used to build {@link DhcpServingParams} are
      * missing or invalid.
      */
@@ -86,13 +93,14 @@
     private DhcpServingParams(@NonNull LinkAddress serverAddr,
             @NonNull Set<Inet4Address> defaultRouters,
             @NonNull Set<Inet4Address> dnsServers, @NonNull Set<Inet4Address> excludedAddrs,
-            long dhcpLeaseTimeSecs, int linkMtu) {
+            long dhcpLeaseTimeSecs, int linkMtu, boolean metered) {
         this.serverAddr = serverAddr;
         this.defaultRouters = defaultRouters;
         this.dnsServers = dnsServers;
         this.excludedAddrs = excludedAddrs;
         this.dhcpLeaseTimeSecs = dhcpLeaseTimeSecs;
         this.linkMtu = linkMtu;
+        this.metered = metered;
     }
 
     @NonNull
@@ -132,6 +140,7 @@
         private Set<Inet4Address> excludedAddrs;
         private long dhcpLeaseTimeSecs;
         private int linkMtu = MTU_UNSET;
+        private boolean metered;
 
         /**
          * Set the server address and served prefix for the DHCP server.
@@ -155,6 +164,25 @@
         }
 
         /**
+         * Set the default routers to be advertised to DHCP clients.
+         *
+         * <p>Each router must be inside the served prefix. This may be an empty list of routers,
+         * but it must always be set explicitly before building the {@link DhcpServingParams}.
+         */
+        public Builder setDefaultRouters(@NonNull Inet4Address... defaultRouters) {
+            return setDefaultRouters(Sets.newArraySet(defaultRouters));
+        }
+
+        /**
+         * Convenience method to build the parameters with no default router.
+         *
+         * <p>Equivalent to calling {@link #setDefaultRouters(Inet4Address...)} with no address.
+         */
+        public Builder withNoDefaultRouter() {
+            return setDefaultRouters();
+        }
+
+        /**
          * Set the DNS servers to be advertised to DHCP clients.
          *
          * <p>This may be an empty set, but it must always be set explicitly before building the
@@ -166,6 +194,25 @@
         }
 
         /**
+         * Set the DNS servers to be advertised to DHCP clients.
+         *
+         * <p>This may be an empty list of servers, but it must always be set explicitly before
+         * building the {@link DhcpServingParams}.
+         */
+        public Builder setDnsServers(@NonNull Inet4Address... dnsServers) {
+            return setDnsServers(Sets.newArraySet(dnsServers));
+        }
+
+        /**
+         * Convenience method to build the parameters with no DNS server.
+         *
+         * <p>Equivalent to calling {@link #setDnsServers(Inet4Address...)} with no address.
+         */
+        public Builder withNoDnsServer() {
+            return setDnsServers();
+        }
+
+        /**
          * Set excluded addresses that the DHCP server is not allowed to assign to clients.
          *
          * <p>This parameter is optional. DNS servers and default routers are always excluded
@@ -177,6 +224,16 @@
         }
 
         /**
+         * Set excluded addresses that the DHCP server is not allowed to assign to clients.
+         *
+         * <p>This parameter is optional. DNS servers and default routers are always excluded
+         * and do not need to be set here.
+         */
+        public Builder setExcludedAddrs(@NonNull Inet4Address... excludedAddrs) {
+            return setExcludedAddrs(Sets.newArraySet(excludedAddrs));
+        }
+
+        /**
          * Set the lease time for leases assigned by the DHCP server.
          *
          * <p>This parameter is required.
@@ -198,6 +255,16 @@
         }
 
         /**
+         * Set whether the DHCP server should send the ANDROID_METERED vendor-specific option.
+         *
+         * <p>If not set, the default value is false.
+         */
+        public Builder setMetered(boolean metered) {
+            this.metered = metered;
+            return this;
+        }
+
+        /**
          * Create a new {@link DhcpServingParams} instance based on parameters set in the builder.
          *
          * <p>This method has no side-effects. If it does not throw, a valid
@@ -251,7 +318,7 @@
                     Collections.unmodifiableSet(new HashSet<>(defaultRouters)),
                     Collections.unmodifiableSet(new HashSet<>(dnsServers)),
                     Collections.unmodifiableSet(excl),
-                    dhcpLeaseTimeSecs, linkMtu);
+                    dhcpLeaseTimeSecs, linkMtu, metered);
         }
     }
 
diff --git a/services/net/java/android/net/ip/IpClient.java b/services/net/java/android/net/ip/IpClient.java
index b77da28..3cdef1e 100644
--- a/services/net/java/android/net/ip/IpClient.java
+++ b/services/net/java/android/net/ip/IpClient.java
@@ -431,6 +431,7 @@
         public ProvisioningConfiguration(ProvisioningConfiguration other) {
             mEnableIPv4 = other.mEnableIPv4;
             mEnableIPv6 = other.mEnableIPv6;
+            mUsingMultinetworkPolicyTracker = other.mUsingMultinetworkPolicyTracker;
             mUsingIpReachabilityMonitor = other.mUsingIpReachabilityMonitor;
             mRequestedPreDhcpActionMs = other.mRequestedPreDhcpActionMs;
             mInitialConfig = InitialConfiguration.copy(other.mInitialConfig);
diff --git a/services/net/java/android/net/util/FdEventsReader.java b/services/net/java/android/net/util/FdEventsReader.java
index 575444f..8bbf449 100644
--- a/services/net/java/android/net/util/FdEventsReader.java
+++ b/services/net/java/android/net/util/FdEventsReader.java
@@ -89,7 +89,7 @@
         mBuffer = buffer;
     }
 
-    public final void start() {
+    public void start() {
         if (onCorrectThread()) {
             createAndRegisterFd();
         } else {
@@ -100,7 +100,7 @@
         }
     }
 
-    public final void stop() {
+    public void stop() {
         if (onCorrectThread()) {
             unregisterAndDestroyFd();
         } else {
diff --git a/services/robotests/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java b/services/robotests/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java
index 801451e..0d2c221 100644
--- a/services/robotests/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java
+++ b/services/robotests/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java
@@ -16,6 +16,8 @@
 
 package com.android.server.backup;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 
 import android.content.ContentResolver;
@@ -51,7 +53,6 @@
 
         mContentResolver = context.getContentResolver();
         mParameters = new BackupAgentTimeoutParameters(new Handler(), mContentResolver);
-        mParameters.start();
     }
 
     /** Stop observing changes to the setting. */
@@ -61,8 +62,11 @@
     }
 
     /** Tests that timeout parameters are initialized with default values on creation. */
+    // TODO: Break down tests
     @Test
     public void testGetParameters_afterConstructorWithStart_returnsDefaultValues() {
+        mParameters.start();
+
         long kvBackupAgentTimeoutMillis = mParameters.getKvBackupAgentTimeoutMillis();
         long fullBackupAgentTimeoutMillis = mParameters.getFullBackupAgentTimeoutMillis();
         long sharedBackupAgentTimeoutMillis = mParameters.getSharedBackupAgentTimeoutMillis();
@@ -86,13 +90,33 @@
                 restoreAgentFinishedTimeoutMillis);
     }
 
+    @Test
+    public void testGetQuotaExceededTimeoutMillis_returnsDefaultValue() {
+        mParameters.start();
+
+        long timeout = mParameters.getQuotaExceededTimeoutMillis();
+
+        assertThat(timeout)
+                .isEqualTo(BackupAgentTimeoutParameters.DEFAULT_QUOTA_EXCEEDED_TIMEOUT_MILLIS);
+    }
+
+    @Test
+    public void testGetQuotaExceededTimeoutMillis_whenSettingSet_returnsSetValue() {
+        putStringAndNotify(
+                BackupAgentTimeoutParameters.SETTING_QUOTA_EXCEEDED_TIMEOUT_MILLIS + "=" + 1279);
+        mParameters.start();
+
+        long timeout = mParameters.getQuotaExceededTimeoutMillis();
+
+        assertThat(timeout).isEqualTo(1279);
+    }
+
     /**
      * Tests that timeout parameters are updated when we call start, even when a setting change
      * occurs while we are not observing.
      */
     @Test
     public void testGetParameters_withSettingChangeBeforeStart_updatesValues() {
-        mParameters.stop();
         long testTimeout = BackupAgentTimeoutParameters.DEFAULT_KV_BACKUP_AGENT_TIMEOUT_MILLIS * 2;
         final String setting =
                 BackupAgentTimeoutParameters.SETTING_KV_BACKUP_AGENT_TIMEOUT_MILLIS
@@ -112,6 +136,7 @@
      */
     @Test
     public void testGetParameters_withSettingChangeAfterStart_updatesValues() {
+        mParameters.start();
         long testTimeout = BackupAgentTimeoutParameters.DEFAULT_KV_BACKUP_AGENT_TIMEOUT_MILLIS * 2;
         final String setting =
                 BackupAgentTimeoutParameters.SETTING_KV_BACKUP_AGENT_TIMEOUT_MILLIS
diff --git a/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java b/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java
new file mode 100644
index 0000000..21b90f1
--- /dev/null
+++ b/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.server.backup.keyvalue;
+
+import static com.android.server.backup.keyvalue.KeyValueBackupReporter.TAG;
+import static com.android.server.backup.testing.TestUtils.assertLogcat;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.backup.IBackupManagerMonitor;
+import android.app.backup.IBackupObserver;
+import android.platform.test.annotations.Presubmit;
+import android.util.Log;
+
+import com.android.server.backup.BackupManagerService;
+import com.android.server.backup.remote.RemoteResult;
+import com.android.server.testing.FrameworkRobolectricTestRunner;
+import com.android.server.testing.SystemLoaderPackages;
+import com.android.server.testing.shadows.ShadowEventLog;
+import com.android.server.testing.shadows.ShadowSlog;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLog;
+
+import java.lang.reflect.Field;
+
+@RunWith(FrameworkRobolectricTestRunner.class)
+@Config(
+        manifest = Config.NONE,
+        sdk = 26,
+        shadows = {ShadowEventLog.class, ShadowSlog.class})
+@SystemLoaderPackages({"com.android.server.backup"})
+@Presubmit
+public class KeyValueBackupReporterTest {
+    @Mock private BackupManagerService mBackupManagerService;
+    @Mock private IBackupObserver mObserver;
+    @Mock private IBackupManagerMonitor mMonitor;
+
+    private KeyValueBackupReporter mReporter;
+
+    @Before
+    public void setUp() throws Exception {
+        mReporter = new KeyValueBackupReporter(mBackupManagerService, mObserver, mMonitor);
+    }
+
+    @Test
+    public void testOnNewThread_logsCorrectly() throws Exception {
+        KeyValueBackupReporter.onNewThread("foo");
+
+        assertLogcat(TAG, Log.DEBUG);
+    }
+
+    @Test
+    public void testGetMonitor_returnsMonitor() throws Exception {
+        IBackupManagerMonitor monitor = mReporter.getMonitor();
+
+        assertThat(monitor).isEqualTo(mMonitor);
+    }
+
+    @Test
+    public void testGetObserver_returnsObserver() throws Exception {
+        IBackupObserver observer = mReporter.getObserver();
+
+        assertThat(observer).isEqualTo(mObserver);
+    }
+
+    @Test
+    public void testOnRevertTask_logsCorrectly() throws Exception {
+        setMoreDebug(true);
+
+        mReporter.onRevertTask();
+
+        assertLogcat(TAG, Log.INFO);
+    }
+
+    @Test
+    public void testOnRemoteCallReturned_logsCorrectly() throws Exception {
+        setMoreDebug(true);
+
+        mReporter.onRemoteCallReturned(RemoteResult.of(3), "onFoo()");
+
+        assertLogcat(TAG, Log.VERBOSE);
+        ShadowLog.LogItem log = ShadowLog.getLogsForTag(TAG).get(0);
+        assertThat(log.msg).contains("onFoo()");
+        assertThat(log.msg).contains("3");
+    }
+
+    /**
+     * HACK: We actually want {@link KeyValueBackupReporter#MORE_DEBUG} to be a constant to be able
+     * to strip those lines at build time. So, we have to do this to test :(
+     */
+    private static void setMoreDebug(boolean value)
+            throws NoSuchFieldException, IllegalAccessException {
+        if (KeyValueBackupReporter.MORE_DEBUG == value) {
+            return;
+        }
+        Field moreDebugField = KeyValueBackupReporter.class.getDeclaredField("MORE_DEBUG");
+        moreDebugField.setAccessible(true);
+        moreDebugField.set(null, value);
+    }
+}
diff --git a/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java b/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java
index 9d6b8d5..82d7ab8 100644
--- a/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java
+++ b/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java
@@ -36,7 +36,9 @@
 import static com.android.server.backup.testing.TestUtils.uncheck;
 import static com.android.server.backup.testing.TestUtils.waitUntil;
 import static com.android.server.backup.testing.TransportData.backupTransport;
+import static com.android.server.backup.testing.Utils.isFileNonEmpty;
 import static com.android.server.backup.testing.Utils.oneTimeIterable;
+import static com.android.server.backup.testing.Utils.transferStreamedData;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -60,6 +62,8 @@
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 import static org.robolectric.shadow.api.Shadow.extract;
+import static org.testng.Assert.fail;
+import static org.testng.Assert.expectThrows;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static java.util.Collections.emptyList;
@@ -104,13 +108,12 @@
 import com.android.server.backup.TransportManager;
 import com.android.server.backup.internal.BackupHandler;
 import com.android.server.backup.internal.OnTaskFinishedListener;
+import com.android.server.backup.remote.RemoteCall;
 import com.android.server.backup.testing.PackageData;
 import com.android.server.backup.testing.TestUtils.ThrowingRunnable;
 import com.android.server.backup.testing.TransportData;
 import com.android.server.backup.testing.TransportTestUtils;
 import com.android.server.backup.testing.TransportTestUtils.TransportMock;
-import com.android.server.backup.testing.Utils;
-import com.android.server.backup.transport.TransportClient;
 import com.android.server.testing.FrameworkRobolectricTestRunner;
 import com.android.server.testing.SystemLoaderClasses;
 import com.android.server.testing.SystemLoaderPackages;
@@ -121,6 +124,7 @@
 
 import com.google.common.truth.IterableSubject;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -184,6 +188,7 @@
     private ShadowLooper mShadowBackupLooper;
     private Handler mBackupHandler;
     private PowerManager.WakeLock mWakeLock;
+    private KeyValueBackupReporter mReporter;
     private ShadowPackageManager mShadowPackageManager;
     private FakeIBackupManager mBackupManager;
     private File mBaseStateDir;
@@ -220,7 +225,6 @@
         mShadowPackageManager = shadowOf(packageManager);
 
         mWakeLock = createBackupWakeLock(mApplication);
-
         mBackupManager = spy(FakeIBackupManager.class);
 
         // Needed to be able to use a real BMS instead of a mock
@@ -244,15 +248,19 @@
         mBackupHandler = mBackupManagerService.getBackupHandler();
         mShadowBackupLooper = shadowOf(mBackupHandler.getLooper());
         ShadowEventLog.setUp();
+        mReporter = spy(new KeyValueBackupReporter(mBackupManagerService, mObserver, mMonitor));
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        ShadowBackupDataInput.reset();
     }
 
     @Test
     public void testRunTask_whenQueueEmpty_updatesBookkeeping() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         when(mBackupManagerService.getCurrentToken()).thenReturn(0L);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, true);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true);
 
         runTask(task);
 
@@ -266,9 +274,7 @@
     public void testRunTask_whenQueueEmpty_releasesWakeLock() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         when(mBackupManagerService.getCurrentToken()).thenReturn(0L);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, true);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true);
 
         runTask(task);
 
@@ -279,9 +285,7 @@
     public void testRunTask_whenQueueEmpty_doesNotProduceData() throws Exception {
         TransportMock transportMock = setUpTransport(mTransport);
         when(mBackupManagerService.getCurrentToken()).thenReturn(0L);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, true);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true);
 
         runTask(task);
 
@@ -293,9 +297,7 @@
     public void testRunTask_whenQueueEmpty_doesNotCallTransport() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         when(mBackupManagerService.getCurrentToken()).thenReturn(0L);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, true);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true);
 
         runTask(task);
 
@@ -308,9 +310,7 @@
     public void testRunTask_whenQueueEmpty_notifiesCorrectly() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         when(mBackupManagerService.getCurrentToken()).thenReturn(0L);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, true);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true);
 
         runTask(task);
 
@@ -322,9 +322,7 @@
     @Test
     public void testRunTask_whenQueueEmpty_doesNotChangeStateFiles() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, true);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true);
         Files.write(getStateFile(mTransport, PM_PACKAGE), "pmState".getBytes());
         Files.write(getStateFile(mTransport, PACKAGE_1), "packageState".getBytes());
 
@@ -340,9 +338,7 @@
     public void testRunTask_whenOnePackageAndTransportUnavailable() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport.unavailable());
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -355,9 +351,7 @@
     public void testRunTask_whenOnePackage_logsBackupStartEvent() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -368,9 +362,7 @@
     public void testRunTask_whenOnePackage_releasesWakeLock() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -384,9 +376,7 @@
         mBackupManagerService.setCurrentToken(0L);
         when(transportMock.transport.getCurrentRestoreSet()).thenReturn(1234L);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -403,12 +393,7 @@
             throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        false,
-                        PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, false, PACKAGE_1);
         Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
 
         runTask(task);
@@ -421,12 +406,7 @@
             throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        true,
-                        PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true, PACKAGE_1);
         Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
 
         runTask(task);
@@ -440,12 +420,7 @@
         setUpAgentWithData(PACKAGE_1);
         PackageManagerBackupAgent pmAgent = spy(createPmAgent());
         when(mBackupManagerService.makeMetadataAgent()).thenReturn(forward(pmAgent));
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        true,
-                        PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true, PACKAGE_1);
 
         runTask(task);
 
@@ -459,12 +434,7 @@
         PackageManagerBackupAgent pmAgent = spy(createPmAgent());
         when(mBackupManagerService.makeMetadataAgent()).thenReturn(forward(pmAgent));
         KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        true,
-                        PACKAGE_1,
-                        PM_PACKAGE);
+                createKeyValueBackupTask(transportMock, true, PACKAGE_1, PM_PACKAGE);
 
         runTask(task);
 
@@ -477,12 +447,7 @@
         setUpAgentWithData(PACKAGE_1);
         PackageManagerBackupAgent pmAgent = spy(createPmAgent());
         when(mBackupManagerService.makeMetadataAgent()).thenReturn(forward(pmAgent));
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        false,
-                        PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, false, PACKAGE_1);
 
         runTask(task);
 
@@ -495,9 +460,7 @@
         TransportMock transportMock = setUpTransport(mTransport);
         // Need 2 packages to be able to verify state of package not involved in the task
         setUpAgentsWithData(PACKAGE_1, PACKAGE_2);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         deletePmStateFile();
         Files.write(getStateFile(mTransport, PACKAGE_2), "package2State".getBytes());
 
@@ -516,9 +479,7 @@
             throws Exception {
         TransportMock transportMock = setUpTransport(mTransport);
         setUpAgentsWithData(PACKAGE_1, PACKAGE_2);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         createPmStateFile();
         Files.write(getStateFile(mTransport, PACKAGE_2), "package2State".getBytes());
 
@@ -535,9 +496,7 @@
         when(transportMock.transport.initializeDevice())
                 .thenReturn(BackupTransport.TRANSPORT_ERROR);
         AgentMock agentMock = setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         deletePmStateFile();
 
         runTask(task);
@@ -556,9 +515,7 @@
         TransportMock transportMock = setUpTransport(mTransport);
         when(transportMock.transport.initializeDevice()).thenThrow(RemoteException.class);
         AgentMock agentMock = setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         deletePmStateFile();
 
         runTask(task);
@@ -575,9 +532,7 @@
     public void testRunTask_whenPackageNotEligibleForBackup() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgentWithData(PACKAGE_1.backupNotAllowed());
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -594,9 +549,7 @@
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         PackageData packageData = fullBackupPackage(1);
         AgentMock agentMock = setUpAgentWithData(packageData);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, packageData);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, packageData);
 
         runTask(task);
 
@@ -611,9 +564,7 @@
     public void testRunTask_whenPackageIsStopped() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgentWithData(PACKAGE_1.stopped());
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -627,9 +578,7 @@
     public void testRunTask_whenPackageUnknown() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         // Not calling setUpAgent()
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -655,9 +604,7 @@
                                     argThat(workSource -> workSource.get(0) == PACKAGE_1.uid));
                     verify(mBackupManagerService, never()).setWorkSource(null);
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -675,9 +622,7 @@
     public void testRunTask_whenAgentUnavailable() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgent(PACKAGE_1.unavailable());
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -693,9 +638,7 @@
         doThrow(SecurityException.class)
                 .when(mBackupManagerService)
                 .bindToAgentSynchronous(argThat(applicationInfo(PACKAGE_1)), anyInt());
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -710,9 +653,7 @@
         when(transportMock.transport.getBackupQuota(PACKAGE_1.packageName, false))
                 .thenThrow(DeadObjectException.class);
         setUpAgent(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -727,9 +668,7 @@
         when(transportMock.transport.getBackupQuota(PACKAGE_1.packageName, false))
                 .thenThrow(DeadObjectException.class);
         setUpAgent(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -743,9 +682,7 @@
         when(transportMock.transport.getBackupQuota(PACKAGE_1.packageName, false))
                 .thenThrow(DeadObjectException.class);
         setUpAgent(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         Files.write(getStateFile(mTransport, PACKAGE_1), "packageState".getBytes());
 
         runTask(task);
@@ -757,31 +694,26 @@
     }
 
     @Test
-    public void testRunTask_whenTransportGetBackupQuotaThrows_revertsOperation() throws Exception {
+    public void testRunTask_whenTransportGetBackupQuotaThrows_revertsTask() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         when(transportMock.transport.getBackupQuota(PACKAGE_1.packageName, false))
                 .thenThrow(DeadObjectException.class);
         setUpAgent(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
-        verify(transportMock.transport).requestBackupTime();
-        assertBackupPendingFor(PACKAGE_1);
-        assertThat(KeyValueBackupJob.isScheduled()).isTrue();
+        assertTaskReverted(transportMock, PACKAGE_1);
     }
 
     /**
-     * For local agents the exception is thrown in our stack, so it hits the catch clause around
-     * invocation earlier than the {@link KeyValueBackupTask#operationComplete(long)} code-path,
-     * invalidating the latter. Note that this happens because {@link
-     * BackupManagerService#opComplete(int, long)} schedules the actual execution to the backup
-     * handler.
+     * For local agents the exception is thrown in our stack, before {@link RemoteCall} has a chance
+     * to complete cleanly.
      */
+    // TODO: When RemoteCall spins up a new thread the assertions on this method should be the same
+    // as the methods below (non-local call).
     @Test
-    public void testRunTask_whenLocalAgentOnBackupThrows() throws Exception {
+    public void testRunTask_whenLocalAgentOnBackupThrows_setsNullWorkSource() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgent(PACKAGE_1);
         agentOnBackupDo(
@@ -789,31 +721,130 @@
                 (oldState, dataOutput, newState) -> {
                     throw new RuntimeException();
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
         verify(mBackupManagerService).setWorkSource(null);
+    }
+
+    @Test
+    public void testRunTask_whenLocalAgentOnBackupThrows_reportsCorrectly() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        AgentMock agentMock = setUpAgent(PACKAGE_1);
+        agentOnBackupDo(
+                agentMock,
+                (oldState, dataOutput, newState) -> {
+                    throw new RuntimeException();
+                });
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
         verify(mObserver).onResult(PACKAGE_1.packageName, ERROR_AGENT_FAILURE);
         verify(mObserver).backupFinished(SUCCESS);
+        verify(mReporter)
+                .onCallAgentDoBackupError(
+                        eq(PACKAGE_1.packageName), eq(true), any(RuntimeException.class));
         assertEventLogged(
                 EventLogTags.BACKUP_AGENT_FAILURE,
                 PACKAGE_1.packageName,
                 new RuntimeException().toString());
+    }
+
+    @Test
+    public void testRunTask_whenLocalAgentOnBackupThrows_doesNotUpdateBookkeping()
+            throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        AgentMock agentMock = setUpAgent(PACKAGE_1);
+        agentOnBackupDo(
+                agentMock,
+                (oldState, dataOutput, newState) -> {
+                    throw new RuntimeException();
+                });
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
         assertBackupPendingFor(PACKAGE_1);
     }
 
     @Test
+    public void testRunTask_whenAgentOnBackupThrows_reportsCorrectly() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        AgentMock agentMock = setUpAgent(PACKAGE_1);
+        remoteAgentOnBackupThrows(
+                agentMock,
+                (oldState, dataOutput, newState) -> {
+                    throw new RuntimeException();
+                });
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        verify(mReporter).onAgentResultError(argThat(packageInfo(PACKAGE_1)));
+    }
+
+    @Test
+    public void testRunTask_whenAgentOnBackupThrows_updatesBookkeeping() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        AgentMock agentMock = setUpAgent(PACKAGE_1);
+        remoteAgentOnBackupThrows(
+                agentMock,
+                (oldState, dataOutput, newState) -> {
+                    throw new RuntimeException();
+                });
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        assertBackupNotPendingFor(PACKAGE_1);
+    }
+
+    @Test
+    public void testRunTask_whenAgentOnBackupThrows_doesNotCallTransport() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        AgentMock agentMock = setUpAgent(PACKAGE_1);
+        remoteAgentOnBackupThrows(
+                agentMock,
+                (oldState, dataOutput, newState) -> {
+                    throw new RuntimeException();
+                });
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        verify(transportMock.transport, never())
+                .performBackup(argThat(packageInfo(PACKAGE_1)), any(), anyInt());
+    }
+
+    @Test
+    public void testRunTask_whenAgentOnBackupThrows_updatesAndCleansUpFiles() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        AgentMock agentMock = setUpAgent(PACKAGE_1);
+        remoteAgentOnBackupThrows(
+                agentMock,
+                (oldState, dataOutput, newState) -> {
+                    throw new RuntimeException();
+                });
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+        Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
+
+        runTask(task);
+
+        assertThat(Files.readAllBytes(getStateFile(mTransport, PACKAGE_1)))
+                .isEqualTo("oldState".getBytes());
+        assertThat(Files.exists(getTemporaryStateFile(mTransport, PACKAGE_1))).isFalse();
+        assertThat(Files.exists(getStagingFile(PACKAGE_1))).isFalse();
+    }
+
+    @Test
     public void testRunTask_whenTransportProvidesFlags_passesThemToTheAgent() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         int flags = BackupAgent.FLAG_CLIENT_SIDE_ENCRYPTION_ENABLED;
         when(transportMock.transport.getTransportFlags()).thenReturn(flags);
         AgentMock agentMock = setUpAgent(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -825,9 +856,7 @@
     public void testRunTask_whenTransportDoesNotProvidesFlags() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgent(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -843,12 +872,7 @@
         List<AgentMock> agentMocks = setUpAgents(PACKAGE_1, PACKAGE_2);
         BackupAgent agent1 = agentMocks.get(0).agent;
         BackupAgent agent2 = agentMocks.get(1).agent;
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        PACKAGE_1,
-                        PACKAGE_2);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1, PACKAGE_2);
 
         runTask(task);
 
@@ -860,9 +884,7 @@
     public void testRunTask_whenTransportChangeFlagsAfterTaskCreation() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgent(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         int flags = BackupAgent.FLAG_CLIENT_SIDE_ENCRYPTION_ENABLED;
         when(transportMock.transport.getTransportFlags()).thenReturn(flags);
 
@@ -883,9 +905,7 @@
                     writeData(dataOutput, prohibitedChar + "key", "data".getBytes());
                     writeState(newState, "newState".getBytes());
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -904,9 +924,7 @@
                     writeData(dataOutput, prohibitedChar + "key", "data".getBytes());
                     writeState(newState, "newState".getBytes());
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
 
         runTask(task);
@@ -928,9 +946,7 @@
                     writeData(dataOutput, prohibitedChar + "key", "data".getBytes());
                     writeState(newState, "newState".getBytes());
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
 
         runTask(task);
@@ -950,9 +966,7 @@
                     writeData(dataOutput, prohibitedChar + "key", "data".getBytes());
                     writeState(newState, "newState".getBytes());
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
 
         runTask(task);
@@ -973,9 +987,7 @@
                     writeData(dataOutput, prohibitedChar + "key", "data".getBytes());
                     writeState(newState, "newState".getBytes());
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
 
         runTask(task);
@@ -1003,12 +1015,7 @@
                     writeData(dataOutput, "key", "data".getBytes());
                     writeState(newState, "newState".getBytes());
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        PACKAGE_1,
-                        PACKAGE_2);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1, PACKAGE_2);
 
         runTask(task);
 
@@ -1028,9 +1035,7 @@
                 (oldState, dataOutput, newState) -> {
                     // No-op
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1047,9 +1052,7 @@
                 (oldState, dataOutput, newState) -> {
                     // No-op
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1066,9 +1069,7 @@
                 (oldState, dataOutput, newState) -> {
                     // No-op
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1085,9 +1086,7 @@
                 (oldState, dataOutput, newState) -> {
                     // No-op
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1103,9 +1102,7 @@
                 (oldState, dataOutput, newState) -> {
                     // No-op
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1130,9 +1127,7 @@
                     writeData(dataOutput, "key2", "data2".getBytes());
                     writeState(newState, "newState".getBytes());
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1155,9 +1150,7 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_OK);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1176,9 +1169,7 @@
                     writeData(dataOutput, "key", "data".getBytes());
                     writeState(newState, "newState".getBytes());
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1196,9 +1187,7 @@
         when(transportMock.transport.performBackup(
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .then(copyBackupDataTo(backupData));
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1210,9 +1199,7 @@
     public void testRunTask_whenFinishBackupSucceeds_notifiesCorrectly() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1226,9 +1213,7 @@
     public void testRunTask_whenFinishBackupSucceeds_updatesBookkeeping() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1242,9 +1227,7 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_PACKAGE_REJECTED);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1259,9 +1242,7 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_PACKAGE_REJECTED);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
 
         runTask(task);
@@ -1279,9 +1260,7 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_PACKAGE_REJECTED);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1296,9 +1275,7 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_PACKAGE_REJECTED);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1314,9 +1291,7 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_PACKAGE_REJECTED);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1333,12 +1308,7 @@
                         argThat(packageInfo(PACKAGE_2)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_OK);
         setUpAgentsWithData(PACKAGE_1, PACKAGE_2);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        PACKAGE_1,
-                        PACKAGE_2);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1, PACKAGE_2);
 
         runTask(task);
 
@@ -1357,12 +1327,7 @@
                         argThat(packageInfo(PACKAGE_2)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_PACKAGE_REJECTED);
         setUpAgentsWithData(PACKAGE_1, PACKAGE_2);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        PACKAGE_1,
-                        PACKAGE_2);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1, PACKAGE_2);
 
         runTask(task);
 
@@ -1372,7 +1337,8 @@
     }
 
     @Test
-    public void testRunTask_whenTransportReturnsQuotaExceeded() throws Exception {
+    public void testRunTask_whenTransportReturnsQuotaExceeded_callsAgentOnQuotaExceeded()
+            throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         when(transportMock.transport.getBackupQuota(PACKAGE_1.packageName, false))
                 .thenReturn(1234L);
@@ -1380,19 +1346,206 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_QUOTA_EXCEEDED);
         AgentMock agentMock = setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        verify(agentMock.agent).onQuotaExceeded(anyLong(), eq(1234L));
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsQuotaExceeded_updatesBookkeeping()
+            throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_QUOTA_EXCEEDED);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        assertBackupNotPendingFor(PACKAGE_1);
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsQuotaExceeded_notifiesAndLogs() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.getBackupQuota(PACKAGE_1.packageName, false))
+                .thenReturn(1234L);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_QUOTA_EXCEEDED);
+        AgentMock agentMock = setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
         verify(mObserver)
                 .onResult(PACKAGE_1.packageName, BackupManager.ERROR_TRANSPORT_QUOTA_EXCEEDED);
         verify(mObserver).backupFinished(SUCCESS);
-        verify(agentMock.agent).onQuotaExceeded(anyLong(), eq(1234L));
         assertEventLogged(EventLogTags.BACKUP_QUOTA_EXCEEDED, PACKAGE_1.packageName);
-        assertBackupNotPendingFor(PACKAGE_1);
-        // TODO: Assert about state/staging files (possible bug)
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsQuotaExceeded_cleansUpFiles() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_QUOTA_EXCEEDED);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        assertThat(Files.exists(getTemporaryStateFile(mTransport, PACKAGE_1))).isFalse();
+        assertThat(Files.exists(getStagingFile(PACKAGE_1))).isFalse();
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsNotInitialized_cleansUpFiles() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_NOT_INITIALIZED);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        assertThat(isFileNonEmpty(getStateFile(mTransport, PACKAGE_1))).isFalse();
+        assertThat(Files.exists(getTemporaryStateFile(mTransport, PACKAGE_1))).isFalse();
+        assertThat(Files.exists(getStagingFile(PACKAGE_1))).isFalse();
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsNotInitialized_reportsCorrectly() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_NOT_INITIALIZED);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        verify(mReporter).onPackageBackupTransportFailure(PACKAGE_1.packageName);
+        verify(mReporter).onTransportNotInitialized();
+        verify(mReporter).onBackupFinished(BackupManager.ERROR_TRANSPORT_ABORTED);
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsNotInitializedForPm_reportsCorrectly()
+            throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PM_PACKAGE)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_NOT_INITIALIZED);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        verify(mReporter).onPackageBackupTransportFailure(PM_PACKAGE.packageName);
+        verify(mReporter).onTransportNotInitialized();
+        verify(mReporter).onBackupFinished(BackupManager.ERROR_TRANSPORT_ABORTED);
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsNotInitialized_doesNotCallSecondAgent()
+            throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_NOT_INITIALIZED);
+        setUpAgentWithData(PACKAGE_1);
+        AgentMock agentMock = setUpAgentWithData(PACKAGE_2);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1, PACKAGE_2);
+
+        runTask(task);
+
+        verify(agentMock.agent, never()).onBackup(any(), any(), any());
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsNotInitialized_revertsTask() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_NOT_INITIALIZED);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        assertTaskReverted(transportMock, PACKAGE_1);
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsNotInitialized_triggersTransportInitialization()
+            throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_NOT_INITIALIZED);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        assertThat(mBackupManagerService.getPendingInits()).contains(mTransport.transportName);
+        verify(mBackupManagerService).backupNow();
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsNotInitialized_cleansUpPmStateFile()
+            throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_NOT_INITIALIZED);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+        Files.write(getStateFile(mTransport, PM_PACKAGE), "pmState".getBytes());
+
+        runTask(task);
+
+        assertThat(Files.exists(getStateFile(mTransport, PM_PACKAGE))).isFalse();
+    }
+
+    @Test
+    public void testRunTask_whenTransportReturnsNotInitializedForPm_cleansUpPmStateFile()
+            throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(
+                        argThat(packageInfo(PM_PACKAGE)), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_NOT_INITIALIZED);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+        Files.write(getStateFile(mTransport, PM_PACKAGE), "pmState".getBytes());
+
+        runTask(task);
+
+        assertThat(Files.exists(getStateFile(mTransport, PM_PACKAGE))).isFalse();
+    }
+
+    @Test
+    public void
+            testRunTask_whenTransportReturnsNotInitializedAndThrowsWhenQueryingName_reportsCorrectly()
+                    throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        when(transportMock.transport.performBackup(any(), any(), anyInt()))
+                .thenReturn(BackupTransport.TRANSPORT_NOT_INITIALIZED);
+        // First one is in startTask(), second is the one we want.
+        when(transportMock.transport.name())
+                .thenReturn(mTransport.transportName)
+                .thenThrow(DeadObjectException.class);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        runTask(task);
+
+        verify(mReporter).onPendingInitializeTransportError(any(DeadObjectException.class));
+        verify(mReporter).onBackupFinished(ERROR_TRANSPORT_ABORTED);
     }
 
     @Test
@@ -1403,12 +1556,7 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        true,
-                        PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true, PACKAGE_1);
         // Delete to be non-incremental
         Files.deleteIfExists(getStateFile(mTransport, PACKAGE_1));
 
@@ -1451,12 +1599,7 @@
                         writeState(newState, "stateForNonIncremental".getBytes());
                     }
                 });
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        false,
-                        PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, false, PACKAGE_1);
         // Write state to be incremental
         Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
 
@@ -1490,9 +1633,7 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_ERROR);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1508,9 +1649,7 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_ERROR);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1518,21 +1657,17 @@
     }
 
     @Test
-    public void testRunTask_whenTransportReturnsError_revertsOperation() throws Exception {
+    public void testRunTask_whenTransportReturnsError_revertsTask() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         when(transportMock.transport.performBackup(
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_ERROR);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
-        verify(transportMock.transport).requestBackupTime();
-        assertBackupPendingFor(PACKAGE_1);
-        assertThat(KeyValueBackupJob.isScheduled()).isTrue();
+        assertTaskReverted(transportMock, PACKAGE_1);
     }
 
     @Test
@@ -1542,18 +1677,15 @@
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenReturn(BackupTransport.TRANSPORT_ERROR);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         Files.write(getStateFile(mTransport, PACKAGE_1), "oldState".getBytes());
 
         runTask(task);
 
         assertThat(Files.readAllBytes(getStateFile(mTransport, PACKAGE_1)))
                 .isEqualTo("oldState".getBytes());
-        // TODO: These should be true (Bug)
-        // assertThat(Files.exists(getTemporaryStateFile(mTransport, PACKAGE_1))).isFalse();
-        // assertThat(Files.exists(getStagingFile(PACKAGE_1))).isFalse();
+        assertThat(Files.exists(getTemporaryStateFile(mTransport, PACKAGE_1))).isFalse();
+        assertThat(Files.exists(getStagingFile(PACKAGE_1))).isFalse();
     }
 
     @Test
@@ -1562,9 +1694,7 @@
         when(transportMock.transport.getBackupQuota(PM_PACKAGE.packageName, false))
                 .thenThrow(DeadObjectException.class);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1581,9 +1711,7 @@
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         PackageManagerBackupAgent pmAgent = createThrowingPmAgent(new RuntimeException());
         when(mBackupManagerService.makeMetadataAgent()).thenReturn(pmAgent);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
 
         runTask(task);
 
@@ -1599,26 +1727,37 @@
     public void testRunTask_whenBackupRunning_doesNotThrow() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         when(mBackupManagerService.isBackupOperationInProgress()).thenReturn(true);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock);
 
         runTask(task);
     }
 
     @Test
+    public void testRunTask_whenReadingBackupDataThrows() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        setUpAgentWithData(PACKAGE_1);
+        AgentMock agentMock = setUpAgentWithData(PACKAGE_2);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1, PACKAGE_2);
+        // We don't validate PM's data, so it will only throw in PACKAGE_1
+        ShadowBackupDataInput.throwInNextHeaderRead();
+
+        runTask(task);
+
+        verify(mReporter).onReadAgentDataError(eq(PACKAGE_1.packageName), any());
+        verify(transportMock.transport, never())
+                .performBackup(argThat(packageInfo(PACKAGE_1)), any(), anyInt());
+        verify(agentMock.agent, never()).onBackup(any(), any(), any());
+        assertTaskReverted(transportMock, PACKAGE_1, PACKAGE_2);
+    }
+
+    @Test
     public void
             testRunTask_whenMarkCancelDuringFirstAgentOnBackup_doesNotCallTransportAfterWaitCancel()
                     throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgent(PACKAGE_1);
         setUpAgentsWithData(PACKAGE_2);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        PACKAGE_1,
-                        PACKAGE_2);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1, PACKAGE_2);
         agentOnBackupDo(
                 agentMock,
                 (oldState, dataOutput, newState) -> {
@@ -1641,9 +1780,7 @@
             throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgent(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         agentOnBackupDo(
                 agentMock,
                 (oldState, dataOutput, newState) -> {
@@ -1667,9 +1804,7 @@
             throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         when(transportMock.transport.performBackup(
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenAnswer(
@@ -1695,12 +1830,7 @@
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentWithData(PACKAGE_1);
         AgentMock agentMock = setUpAgent(PACKAGE_2);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        PACKAGE_1,
-                        PACKAGE_2);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1, PACKAGE_2);
         agentOnBackupDo(
                 agentMock,
                 (oldState, dataOutput, newState) -> {
@@ -1727,12 +1857,7 @@
                     throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentsWithData(PACKAGE_1, PACKAGE_2);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient,
-                        mTransport.transportDirName,
-                        PACKAGE_1,
-                        PACKAGE_2);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1, PACKAGE_2);
         when(transportMock.transport.performBackup(
                         argThat(packageInfo(PACKAGE_1)), any(), anyInt()))
                 .thenAnswer(
@@ -1757,9 +1882,7 @@
     public void testRunTask_afterMarkCancel_doesNotCallAgentOrTransport() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         AgentMock agentMock = setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         task.markCancel();
 
         runTask(task);
@@ -1773,9 +1896,7 @@
     public void testWaitCancel_afterCancelledTaskFinished_returns() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         task.markCancel();
         runTask(task);
 
@@ -1783,13 +1904,12 @@
     }
 
     @Test
-    public void testWaitCancel_whenMarkCancelDuringAgentOnBackup_unregistersTask() throws Exception {
+    public void testWaitCancel_whenMarkCancelDuringAgentOnBackup_unregistersTask()
+            throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentWithData(PACKAGE_1);
         AgentMock agentMock = setUpAgent(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         agentOnBackupDo(
                 agentMock,
                 (oldState, dataOutput, newState) -> {
@@ -1816,14 +1936,35 @@
     public void testMarkCancel_afterTaskFinished_returns() throws Exception {
         TransportMock transportMock = setUpInitializedTransport(mTransport);
         setUpAgentWithData(PACKAGE_1);
-        KeyValueBackupTask task =
-                createKeyValueBackupTask(
-                        transportMock.transportClient, mTransport.transportDirName, PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
         runTask(task);
 
         task.markCancel();
     }
 
+    @Test
+    public void testHandleCancel_callsMarkCancelAndWaitCancel() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = spy(createKeyValueBackupTask(transportMock, PACKAGE_1));
+        doNothing().when(task).waitCancel();
+
+        task.handleCancel(true);
+
+        InOrder inOrder = inOrder(task);
+        inOrder.verify(task).markCancel();
+        inOrder.verify(task).waitCancel();
+    }
+
+    @Test
+    public void testHandleCancel_whenCancelAllFalse_throws() throws Exception {
+        TransportMock transportMock = setUpInitializedTransport(mTransport);
+        setUpAgentWithData(PACKAGE_1);
+        KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1);
+
+        expectThrows(IllegalArgumentException.class, () -> task.handleCancel(false));
+    }
+
     private void runTask(KeyValueBackupTask task) {
         // Pretend we are not on the main-thread to prevent RemoteCall from complaining
         mShadowMainLooper.setCurrentThread(false);
@@ -1997,15 +2138,12 @@
     }
 
     private KeyValueBackupTask createKeyValueBackupTask(
-            TransportClient transportClient, String transportDirName, PackageData... packages) {
-        return createKeyValueBackupTask(transportClient, transportDirName, false, packages);
+            TransportMock transportMock, PackageData... packages) {
+        return createKeyValueBackupTask(transportMock, false, packages);
     }
 
     private KeyValueBackupTask createKeyValueBackupTask(
-            TransportClient transportClient,
-            String transportDirName,
-            boolean nonIncremental,
-            PackageData... packages) {
+            TransportMock transportMock, boolean nonIncremental, PackageData... packages) {
         List<String> queue =
                 Stream.of(packages).map(packageData -> packageData.packageName).collect(toList());
         mBackupManagerService.getPendingBackups().clear();
@@ -2015,12 +2153,11 @@
         KeyValueBackupTask task =
                 new KeyValueBackupTask(
                         mBackupManagerService,
-                        transportClient,
-                        transportDirName,
+                        transportMock.transportClient,
+                        transportMock.transportData.transportDirName,
                         queue,
                         mOldJournal,
-                        mObserver,
-                        mMonitor,
+                        mReporter,
                         mListener,
                         emptyList(),
                         /* userInitiated */ false,
@@ -2121,6 +2258,10 @@
      * Implements {@code function} for {@link BackupAgent#onBackup(ParcelFileDescriptor,
      * BackupDataOutput, ParcelFileDescriptor)} of {@code agentMock} and populates {@link
      * AgentMock#oldState}.
+     *
+     * <p>Note that for throwing agents this will simulate a local agent (the exception will be
+     * thrown in our stack), use {@link #remoteAgentOnBackupThrows(AgentMock, BackupAgentOnBackup)}
+     * if you want to simulate a remote agent.
      */
     private static void agentOnBackupDo(AgentMock agentMock, BackupAgentOnBackup function)
             throws Exception {
@@ -2129,7 +2270,7 @@
                                 (oldState, dataOutput, newState) -> {
                                     ByteArrayOutputStream outputStream =
                                             new ByteArrayOutputStream();
-                                    Utils.transferStreamedData(
+                                    transferStreamedData(
                                             new FileInputStream(oldState.getFileDescriptor()),
                                             outputStream);
                                     agentMock.oldState = outputStream.toByteArray();
@@ -2141,6 +2282,33 @@
     }
 
     /**
+     * Use this method to simulate a remote agent throwing. We catch the exception thrown, thus
+     * simulating a one-way call. It also populates {@link AgentMock#oldState}.
+     *
+     * @param agentMock The Agent mock.
+     * @param function A function that throws, otherwise the test will fail.
+     */
+    // TODO: Remove when RemoteCall spins up a dedicated thread for calls
+    private static void remoteAgentOnBackupThrows(AgentMock agentMock, BackupAgentOnBackup function)
+            throws Exception {
+        agentOnBackupDo(agentMock, function);
+        doAnswer(
+                        invocation -> {
+                            try {
+                                invocation.callRealMethod();
+                                fail("Agent method expected to throw");
+                            } catch (RuntimeException e) {
+                                // This silences the exception just like a one-way call would, the
+                                // normal completion via IBackupCallback binder still happens, check
+                                // finally() block of IBackupAgent.doBackup().
+                            }
+                            return null;
+                        })
+                .when(agentMock.agentBinder)
+                .doBackup(any(), any(), any(), anyLong(), any(), anyInt());
+    }
+
+    /**
      * Returns an {@link Answer} that can be used for mocking {@link
      * IBackupTransport#performBackup(PackageInfo, ParcelFileDescriptor, int)} that copies the
      * backup data received to {@code backupDataPath} and returns {@code result}.
@@ -2180,18 +2348,31 @@
         assertThat(packages).doesNotContain(packageName);
     }
 
-    private void assertBackupPendingFor(PackageData packageData) throws IOException {
-        String packageName = packageData.packageName;
-        // We verify the current journal, NOT the old one passed to KeyValueBackupTask constructor
-        assertThat(mBackupManagerService.getJournal().getPackages()).contains(packageName);
-        assertThat(mBackupManagerService.getPendingBackups()).containsKey(packageName);
+    private void assertTaskReverted(TransportMock transportMock, PackageData... packages)
+            throws RemoteException, IOException {
+        verify(transportMock.transport).requestBackupTime();
+        assertBackupPendingFor(packages);
+        assertThat(KeyValueBackupJob.isScheduled()).isTrue();
     }
 
-    private void assertBackupNotPendingFor(PackageData packageData) throws IOException {
-        String packageName = packageData.packageName;
-        // We verify the current journal, NOT the old one passed to KeyValueBackupTask constructor
-        assertJournalDoesNotContain(mBackupManagerService.getJournal(), packageName);
-        assertThat(mBackupManagerService.getPendingBackups()).doesNotContainKey(packageName);
+    private void assertBackupPendingFor(PackageData... packages) throws IOException {
+        for (PackageData packageData : packages) {
+            String packageName = packageData.packageName;
+            // We verify the current journal, NOT the old one passed to KeyValueBackupTask
+            // constructor
+            assertThat(mBackupManagerService.getJournal().getPackages()).contains(packageName);
+            assertThat(mBackupManagerService.getPendingBackups()).containsKey(packageName);
+        }
+    }
+
+    private void assertBackupNotPendingFor(PackageData... packages) throws IOException {
+        for (PackageData packageData : packages) {
+            String packageName = packageData.packageName;
+            // We verify the current journal, NOT the old one passed to KeyValueBackupTask
+            // constructor
+            assertJournalDoesNotContain(mBackupManagerService.getJournal(), packageName);
+            assertThat(mBackupManagerService.getPendingBackups()).doesNotContainKey(packageName);
+        }
     }
 
     private void assertDataHasKeyValue(BackupDataInput backupData, String key, byte[] value)
diff --git a/services/robotests/src/com/android/server/backup/remote/FutureBackupCallbackTest.java b/services/robotests/src/com/android/server/backup/remote/FutureBackupCallbackTest.java
index aec207d..f3621e2 100644
--- a/services/robotests/src/com/android/server/backup/remote/FutureBackupCallbackTest.java
+++ b/services/robotests/src/com/android/server/backup/remote/FutureBackupCallbackTest.java
@@ -41,6 +41,6 @@
 
         callback.operationComplete(7);
 
-        assertThat(future.get()).isEqualTo(RemoteResult.successful(7));
+        assertThat(future.get()).isEqualTo(RemoteResult.of(7));
     }
 }
diff --git a/services/robotests/src/com/android/server/backup/remote/RemoteCallTest.java b/services/robotests/src/com/android/server/backup/remote/RemoteCallTest.java
index 55db616..1d92bed 100644
--- a/services/robotests/src/com/android/server/backup/remote/RemoteCallTest.java
+++ b/services/robotests/src/com/android/server/backup/remote/RemoteCallTest.java
@@ -161,7 +161,7 @@
     }
 
     @Test
-    public void testCall_whenCallbackIsCalledBeforeTimeOut_returnsSuccess() throws Exception {
+    public void testCall_whenCallbackIsCalledBeforeTimeOut_returnsResult() throws Exception {
         ConditionVariable scheduled = new ConditionVariable(false);
         RemoteCall remoteCall =
                 new RemoteCall(
@@ -176,11 +176,11 @@
 
         scheduled.block();
         runToEndOfTasks(Looper.getMainLooper());
-        assertThat(result.get()).isEqualTo(RemoteResult.successful(3));
+        assertThat(result.get()).isEqualTo(RemoteResult.of(3));
     }
 
     @Test
-    public void testCall_whenCallbackIsCalledBeforeCancel_returnsSuccess() throws Exception {
+    public void testCall_whenCallbackIsCalledBeforeCancel_returnsResult() throws Exception {
         CompletableFuture<IBackupCallback> callbackFuture = new CompletableFuture<>();
         RemoteCall remoteCall = new RemoteCall(callbackFuture::complete, 1000);
 
@@ -191,7 +191,7 @@
         IBackupCallback callback = callbackFuture.get();
         callback.operationComplete(3);
         remoteCall.cancel();
-        assertThat(result.get()).isEqualTo(RemoteResult.successful(3));
+        assertThat(result.get()).isEqualTo(RemoteResult.of(3));
     }
 
     @Test
@@ -222,6 +222,37 @@
         assertThat(result.get()).isEqualTo(RemoteResult.FAILED_CANCELLED);
     }
 
+    @Test
+    public void testExecute_whenCallbackIsCalledBeforeTimeout_returnsResult() throws Exception {
+        RemoteResult result =
+                runInWorkerThread(
+                        () -> RemoteCall.execute(callback -> callback.operationComplete(3), 1000));
+
+        assertThat(result.get()).isEqualTo(3);
+    }
+
+    @Test
+    public void testExecute_whenTimesOutBeforeCallback_returnsTimeOut() throws Exception {
+        ConditionVariable scheduled = new ConditionVariable(false);
+
+        Future<RemoteResult> result =
+                runInWorkerThreadAsync(
+                        () ->
+                                RemoteCall.execute(
+                                        callback -> {
+                                            postDelayed(
+                                                    Handler.getMain(),
+                                                    () -> callback.operationComplete(0),
+                                                    1000);
+                                            scheduled.open();
+                                        },
+                                        500));
+
+        scheduled.block();
+        runToEndOfTasks(Looper.getMainLooper());
+        assertThat(result.get()).isEqualTo(RemoteResult.FAILED_TIMED_OUT);
+    }
+
     private static <T> Future<T> runInWorkerThreadAsync(Callable<T> supplier) {
         CompletableFuture<T> future = new CompletableFuture<>();
         new Thread(() -> future.complete(uncheck(supplier)), "test-worker-thread").start();
diff --git a/services/robotests/src/com/android/server/backup/remote/RemoteResultTest.java b/services/robotests/src/com/android/server/backup/remote/RemoteResultTest.java
index f1c4f27..7f6fd57 100644
--- a/services/robotests/src/com/android/server/backup/remote/RemoteResultTest.java
+++ b/services/robotests/src/com/android/server/backup/remote/RemoteResultTest.java
@@ -35,28 +35,38 @@
 @Presubmit
 public class RemoteResultTest {
     @Test
-    public void testSucceeded_whenSuccessfulResult_returnsTrue() {
-        RemoteResult result = RemoteResult.successful(3);
+    public void testIsPresent_whenNonFailedResult_returnsTrue() {
+        RemoteResult result = RemoteResult.of(3);
 
-        boolean succeeded = result.succeeded();
+        boolean isPresent = result.isPresent();
 
-        assertThat(succeeded).isTrue();
+        assertThat(isPresent).isTrue();
     }
 
     @Test
-    public void testSucceeded_whenFailedResults_returnsFalse() {
-        boolean timeOutSucceeded = RemoteResult.FAILED_TIMED_OUT.succeeded();
-        boolean cancelledSucceeded = RemoteResult.FAILED_CANCELLED.succeeded();
-        boolean threadInterruptedSucceeded = RemoteResult.FAILED_THREAD_INTERRUPTED.succeeded();
+    public void testIsPresent_whenTimeOutResult_returnsFalse() {
+        boolean timeOutIsPresent = RemoteResult.FAILED_TIMED_OUT.isPresent();
 
-        assertThat(timeOutSucceeded).isFalse();
-        assertThat(cancelledSucceeded).isFalse();
-        assertThat(threadInterruptedSucceeded).isFalse();
+        assertThat(timeOutIsPresent).isFalse();
+    }
+
+    @Test
+    public void testIsPresent_whenCancelledResult_returnsFalse() {
+        boolean cancelledIsPresent = RemoteResult.FAILED_CANCELLED.isPresent();
+
+        assertThat(cancelledIsPresent).isFalse();
+    }
+
+    @Test
+    public void testIsPresent_whenThreadInterruptedResult_returnsFalse() {
+        boolean threadInterruptedIsPresent = RemoteResult.FAILED_THREAD_INTERRUPTED.isPresent();
+
+        assertThat(threadInterruptedIsPresent).isFalse();
     }
 
     @Test
     public void testGet_whenSuccessfulResult_returnsValue() {
-        RemoteResult result = RemoteResult.successful(7);
+        RemoteResult result = RemoteResult.of(7);
 
         long value = result.get();
 
@@ -72,7 +82,7 @@
 
     @Test
     public void testToString() {
-        assertThat(RemoteResult.successful(3).toString()).isEqualTo("RemoteResult{3}");
+        assertThat(RemoteResult.of(3).toString()).isEqualTo("RemoteResult{3}");
         assertThat(RemoteResult.FAILED_TIMED_OUT.toString())
                 .isEqualTo("RemoteResult{FAILED_TIMED_OUT}");
         assertThat(RemoteResult.FAILED_CANCELLED.toString())
@@ -83,14 +93,14 @@
 
     @Test
     public void testEquals() {
-        assertThat(RemoteResult.successful(3).equals(RemoteResult.successful(3))).isTrue();
-        assertThat(RemoteResult.successful(3).equals(RemoteResult.successful(7))).isFalse();
-        assertThat(RemoteResult.successful(-1).equals(RemoteResult.successful(1))).isFalse();
-        assertThat(RemoteResult.successful(Long.MAX_VALUE).equals(RemoteResult.successful(-1)))
+        assertThat(RemoteResult.of(3).equals(RemoteResult.of(3))).isTrue();
+        assertThat(RemoteResult.of(3).equals(RemoteResult.of(7))).isFalse();
+        assertThat(RemoteResult.of(-1).equals(RemoteResult.of(1))).isFalse();
+        assertThat(RemoteResult.of(Long.MAX_VALUE).equals(RemoteResult.of(-1)))
                 .isFalse();
-        assertThat(RemoteResult.successful(3).equals(RemoteResult.FAILED_TIMED_OUT)).isFalse();
-        assertThat(RemoteResult.successful(3).equals("3")).isFalse();
-        assertThat(RemoteResult.successful(3).equals(null)).isFalse();
+        assertThat(RemoteResult.of(3).equals(RemoteResult.FAILED_TIMED_OUT)).isFalse();
+        assertThat(RemoteResult.of(3).equals("3")).isFalse();
+        assertThat(RemoteResult.of(3).equals(null)).isFalse();
         assertThat(RemoteResult.FAILED_TIMED_OUT.equals(RemoteResult.FAILED_TIMED_OUT)).isTrue();
         assertThat(RemoteResult.FAILED_TIMED_OUT.equals(RemoteResult.FAILED_CANCELLED)).isFalse();
     }
@@ -98,9 +108,9 @@
     /** @see Object#hashCode() */
     @Test
     public void testHashCode() {
-        RemoteResult result3 = RemoteResult.successful(3);
+        RemoteResult result3 = RemoteResult.of(3);
         assertThat(result3.hashCode()).isEqualTo(result3.hashCode());
-        assertThat(result3.hashCode()).isEqualTo(RemoteResult.successful(3).hashCode());
+        assertThat(result3.hashCode()).isEqualTo(RemoteResult.of(3).hashCode());
         assertThat(RemoteResult.FAILED_TIMED_OUT.hashCode())
                 .isEqualTo(RemoteResult.FAILED_TIMED_OUT.hashCode());
         assertThat(RemoteResult.FAILED_CANCELLED.hashCode())
diff --git a/services/robotests/src/com/android/server/backup/testing/TestUtils.java b/services/robotests/src/com/android/server/backup/testing/TestUtils.java
index df4d457..2f54513 100644
--- a/services/robotests/src/com/android/server/backup/testing/TestUtils.java
+++ b/services/robotests/src/com/android/server/backup/testing/TestUtils.java
@@ -20,6 +20,8 @@
 
 import static org.robolectric.Shadows.shadowOf;
 
+import static java.util.stream.Collectors.toSet;
+
 import android.os.Looper;
 import android.os.Message;
 import android.os.MessageQueue;
@@ -36,6 +38,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.stream.IntStream;
 
 public class TestUtils {
     private static final long TIMEOUT_MS = 3000;
@@ -87,20 +90,45 @@
         ShadowSystemClock.setCurrentTimeMillis(shadowLooper.getScheduler().getCurrentTime());
     }
 
-    /** Reset logcat with {@link ShadowLog#reset()} before the test case. */
+    /**
+     * Reset logcat with {@link ShadowLog#reset()} before the test case if you do anything that uses
+     * logcat before that.
+     */
     public static void assertLogcatAtMost(String tag, int level) {
         assertThat(ShadowLog.getLogsForTag(tag).stream().allMatch(logItem -> logItem.type <= level))
                 .named("All logs <= " + level)
                 .isTrue();
     }
 
-    /** Reset logcat with {@link ShadowLog#reset()} before the test case. */
+    /**
+     * Reset logcat with {@link ShadowLog#reset()} before the test case if you do anything that uses
+     * logcat before that.
+     */
     public static void assertLogcatAtLeast(String tag, int level) {
         assertThat(ShadowLog.getLogsForTag(tag).stream().anyMatch(logItem -> logItem.type >= level))
                 .named("Any log >= " + level)
                 .isTrue();
     }
 
+    /**
+     * Verifies that logcat has produced log items as specified per level in {@code logs} (with
+     * repetition).
+     *
+     * <p>So, if you call {@code assertLogcat(TAG, Log.ERROR, Log.ERROR)}, you assert that there are
+     * exactly 2 log items, each with level ERROR.
+     *
+     * <p>Reset logcat with {@link ShadowLog#reset()} before the test case if you do anything
+     * that uses logcat before that.
+     */
+    public static void assertLogcat(String tag, int... logs) {
+        assertThat(
+                        ShadowLog.getLogsForTag(tag).stream()
+                                .map(logItem -> logItem.type)
+                                .collect(toSet()))
+                .named("Log items (specified per level)")
+                .containsExactly(IntStream.of(logs).boxed().toArray());
+    }
+
     public static void assertLogcatContains(String tag, Predicate<ShadowLog.LogItem> predicate) {
         assertThat(ShadowLog.getLogsForTag(tag).stream().anyMatch(predicate)).isTrue();
     }
diff --git a/services/robotests/src/com/android/server/backup/testing/TransportTestUtils.java b/services/robotests/src/com/android/server/backup/testing/TransportTestUtils.java
index 6625443..f6ed630 100644
--- a/services/robotests/src/com/android/server/backup/testing/TransportTestUtils.java
+++ b/services/robotests/src/com/android/server/backup/testing/TransportTestUtils.java
@@ -164,18 +164,18 @@
                 when(transportClientMock.connectOrThrow(any())).thenReturn(transportMock);
                 when(transportClientMock.connect(any())).thenReturn(transportMock);
 
-                return new TransportMock(transportClientMock, transportMock);
+                return new TransportMock(transport, transportClientMock, transportMock);
             } else {
                 // Transport registered but unavailable
                 when(transportClientMock.connectOrThrow(any()))
                         .thenThrow(TransportNotAvailableException.class);
                 when(transportClientMock.connect(any())).thenReturn(null);
 
-                return new TransportMock(transportClientMock, null);
+                return new TransportMock(transport, transportClientMock, null);
             }
         } else {
             // Transport not registered
-            return new TransportMock(null, null);
+            return new TransportMock(transport, null, null);
         }
     }
 
@@ -196,11 +196,15 @@
     }
 
     public static class TransportMock {
+        public final TransportData transportData;
         @Nullable public final TransportClient transportClient;
         @Nullable public final IBackupTransport transport;
 
         private TransportMock(
-                @Nullable TransportClient transportClient, @Nullable IBackupTransport transport) {
+                TransportData transportData,
+                @Nullable TransportClient transportClient,
+                @Nullable IBackupTransport transport) {
+            this.transportData = transportData;
             this.transportClient = transportClient;
             this.transport = transport;
         }
diff --git a/services/robotests/src/com/android/server/backup/testing/Utils.java b/services/robotests/src/com/android/server/backup/testing/Utils.java
index bd8b4ef..b0e00a2 100644
--- a/services/robotests/src/com/android/server/backup/testing/Utils.java
+++ b/services/robotests/src/com/android/server/backup/testing/Utils.java
@@ -19,6 +19,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Iterator;
 
 public class Utils {
@@ -41,5 +43,9 @@
         return () -> iterator;
     }
 
+    public static boolean isFileNonEmpty(Path path) throws IOException {
+        return Files.exists(path) && Files.size(path) > 0;
+    }
+
     private Utils() {}
 }
diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowBackupDataInput.java b/services/robotests/src/com/android/server/testing/shadows/ShadowBackupDataInput.java
index bc47dd5..4901828 100644
--- a/services/robotests/src/com/android/server/testing/shadows/ShadowBackupDataInput.java
+++ b/services/robotests/src/com/android/server/testing/shadows/ShadowBackupDataInput.java
@@ -20,6 +20,7 @@
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
 
 import java.io.EOFException;
 import java.io.FileDescriptor;
@@ -33,6 +34,17 @@
  */
 @Implements(BackupDataInput.class)
 public class ShadowBackupDataInput {
+    private static boolean sReadNextHeaderThrow = false;
+
+    public static void throwInNextHeaderRead() {
+        sReadNextHeaderThrow = true;
+    }
+
+    @Resetter
+    public static void reset() {
+        sReadNextHeaderThrow = false;
+    }
+
     private FileDescriptor mFileDescriptor;
     private ObjectInputStream mInput;
     private int mSize;
@@ -46,6 +58,10 @@
 
     @Implementation
     public boolean readNextHeader() throws IOException {
+        if (sReadNextHeaderThrow) {
+            sReadNextHeaderThrow = false;
+            throw new IOException("Fake exception");
+        }
         mHeaderReady = false;
         try {
             ensureInput();
diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java b/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java
index aeda2dc..b7db56b 100644
--- a/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java
+++ b/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java
@@ -17,12 +17,11 @@
 package com.android.server.testing.shadows;
 
 import android.annotation.Nullable;
-import android.app.backup.IBackupManagerMonitor;
-import android.app.backup.IBackupObserver;
 
 import com.android.server.backup.BackupManagerService;
 import com.android.server.backup.DataChangedJournal;
 import com.android.server.backup.internal.OnTaskFinishedListener;
+import com.android.server.backup.keyvalue.KeyValueBackupReporter;
 import com.android.server.backup.keyvalue.KeyValueBackupTask;
 import com.android.server.backup.transport.TransportClient;
 
@@ -57,12 +56,11 @@
     public void __constructor__(
             BackupManagerService backupManagerService,
             TransportClient transportClient,
-            String dirName,
+            String transportDirName,
             List<String> queue,
-            @Nullable DataChangedJournal journal,
-            IBackupObserver observer,
-            IBackupManagerMonitor monitor,
-            @Nullable OnTaskFinishedListener listener,
+            @Nullable DataChangedJournal dataChangedJournal,
+            KeyValueBackupReporter reporter,
+            OnTaskFinishedListener listener,
             List<String> pendingFullBackups,
             boolean userInitiated,
             boolean nonIncremental) {
diff --git a/services/tests/servicestests/src/com/android/server/MountServiceTests.java b/services/tests/servicestests/src/com/android/server/MountServiceTests.java
index ecfe0db..b1b3174 100644
--- a/services/tests/servicestests/src/com/android/server/MountServiceTests.java
+++ b/services/tests/servicestests/src/com/android/server/MountServiceTests.java
@@ -220,7 +220,12 @@
 
         final File outFile = getFilePath("test1_nosig.obb");
 
-        mountObb(sm, R.raw.test1_nosig, outFile, OnObbStateChangeListener.ERROR_INTERNAL);
+        try {
+            mountObb(sm, R.raw.test1_nosig, outFile, OnObbStateChangeListener.ERROR_INTERNAL);
+            fail("mountObb should've failed with an exception");
+        } catch (IllegalArgumentException e) {
+            // Expected
+        }
 
         assertFalse("OBB should not be mounted",
                 sm.isObbMounted(outFile.getPath()));
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityGestureDetectorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityGestureDetectorTest.java
index 41b834a..1c025cf 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityGestureDetectorTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityGestureDetectorTest.java
@@ -46,23 +46,8 @@
     private static final int PATH_STEP_PIXELS = 200;
     private static final long PATH_STEP_MILLISEC = 100;
 
-    /**
-     * AccessibilitGestureDetector that can mock double-tap detector.
-     */
-    private class AccessibilityGestureDetectorTestable extends AccessibilityGestureDetector {
-        public AccessibilityGestureDetectorTestable(Context context, Listener listener) {
-            super(context, listener);
-        }
-
-        protected void setDoubleTapDetector(GestureDetector gestureDetector) {
-            mGestureDetector = gestureDetector;
-            mGestureDetector.setOnDoubleTapListener(this);
-        }
-    }
-
-
     // Data used by all tests
-    private AccessibilityGestureDetectorTestable mDetector;
+    private AccessibilityGestureDetector mDetector;
     private AccessibilityGestureDetector.Listener mResultListener;
 
 
@@ -87,9 +72,8 @@
 
         // Construct a testable AccessibilityGestureDetector.
         mResultListener = mock(AccessibilityGestureDetector.Listener.class);
-        mDetector = new AccessibilityGestureDetectorTestable(contextMock, mResultListener);
         GestureDetector doubleTapDetectorMock = mock(GestureDetector.class);
-        mDetector.setDoubleTapDetector(doubleTapDetectorMock);
+        mDetector = new AccessibilityGestureDetector(contextMock, mResultListener, doubleTapDetectorMock);
     }
 
 
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/TouchExplorerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/TouchExplorerTest.java
new file mode 100644
index 0000000..c47885f
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/accessibility/TouchExplorerTest.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.accessibility;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+import android.graphics.PointF;
+import android.os.SystemClock;
+import android.util.DebugUtils;
+import android.view.InputDevice;
+import android.view.MotionEvent;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class TouchExplorerTest {
+
+    public static final int STATE_TOUCH_EXPLORING = 0x00000001;
+    public static final int STATE_DRAGGING = 0x00000002;
+    public static final int STATE_DELEGATING = 0x00000004;
+
+    private static final int FLAG_1FINGER = 0x8000;
+    private static final int FLAG_2FINGERS = 0x0100;
+    private static final int FLAG_3FINGERS = 0x0200;
+    private static final int FLAG_MOVING = 0x00010000;
+    private static final int FLAG_MOVING_DIFF_DIRECTION = 0x00020000;
+
+    private static final int STATE_TOUCH_EXPLORING_1FINGER = STATE_TOUCH_EXPLORING | FLAG_1FINGER;
+    private static final int STATE_TOUCH_EXPLORING_2FINGER = STATE_TOUCH_EXPLORING | FLAG_2FINGERS;
+    private static final int STATE_TOUCH_EXPLORING_3FINGER = STATE_TOUCH_EXPLORING | FLAG_3FINGERS;
+    private static final int STATE_MOVING_2FINGERS = STATE_TOUCH_EXPLORING_2FINGER | FLAG_MOVING;
+    private static final int STATE_MOVING_3FINGERS = STATE_TOUCH_EXPLORING_3FINGER | FLAG_MOVING;
+    private static final int STATE_DRAGGING_2FINGERS = STATE_DRAGGING | FLAG_2FINGERS;
+    private static final int STATE_PINCH_2FINGERS =
+            STATE_TOUCH_EXPLORING_2FINGER | FLAG_MOVING_DIFF_DIRECTION;
+    private static final float DEFAULT_X = 301f;
+    private static final float DEFAULT_Y = 299f;
+
+    private EventStreamTransformation mCaptor;
+    private MotionEvent mLastEvent;
+    private TouchExplorer mTouchExplorer;
+    private long mLastDownTime = Integer.MIN_VALUE;
+
+    /**
+     * {@link TouchExplorer#sendDownForAllNotInjectedPointers} injecting events with the same object
+     * is resulting {@link ArgumentCaptor} to capture events with last state. Before implementation
+     * change, this helper class will save copies to verify the result.
+     */
+    private class EventCaptor implements EventStreamTransformation {
+        List<MotionEvent> mEvents = new ArrayList<>();
+
+        @Override
+        public void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
+            mEvents.add(0, event.copy());
+        }
+
+        @Override
+        public void setNext(EventStreamTransformation next) {
+        }
+
+        @Override
+        public EventStreamTransformation getNext() {
+            return null;
+        }
+    }
+
+    @Before
+    public void setUp() {
+        Context context = InstrumentationRegistry.getContext();
+        AccessibilityManagerService ams = new AccessibilityManagerService(context);
+        mCaptor = new EventCaptor();
+        mTouchExplorer = new TouchExplorer(context, ams);
+        mTouchExplorer.setNext(mCaptor);
+    }
+
+    @Test
+    public void testTwoFingersMove_shouldDelegatingAndInjectActionDownPointerDown() {
+        goFromStateIdleTo(STATE_MOVING_2FINGERS);
+
+        assertState(STATE_DELEGATING);
+        assertCapturedEvents(
+                MotionEvent.ACTION_DOWN,
+                MotionEvent.ACTION_POINTER_DOWN);
+        assertCapturedEventsNoHistory();
+    }
+
+    @Test
+    public void testTwoFingersDrag_shouldDraggingAndActionDown() {
+        goFromStateIdleTo(STATE_DRAGGING_2FINGERS);
+
+        assertState(STATE_DRAGGING);
+        assertCapturedEvents(MotionEvent.ACTION_DOWN);
+        assertCapturedEventsNoHistory();
+    }
+
+    @Test
+    public void testTwoFingersNotDrag_shouldDelegatingAndActionUpDownPointerDown() {
+        // only from dragging state, and withMoveHistory no dragging
+        goFromStateIdleTo(STATE_PINCH_2FINGERS);
+
+        assertState(STATE_DELEGATING);
+        assertCapturedEvents(
+                /* goto dragging state */ MotionEvent.ACTION_DOWN,
+                /* leave dragging state */ MotionEvent.ACTION_UP,
+                MotionEvent.ACTION_DOWN,
+                MotionEvent.ACTION_POINTER_DOWN);
+        assertCapturedEventsNoHistory();
+    }
+
+    @Test
+    public void testThreeFingersMove_shouldDelegatingAnd3ActionPointerDown() {
+        goFromStateIdleTo(STATE_MOVING_3FINGERS);
+
+        assertState(STATE_DELEGATING);
+        assertCapturedEvents(
+                MotionEvent.ACTION_DOWN,
+                MotionEvent.ACTION_POINTER_DOWN,
+                MotionEvent.ACTION_POINTER_DOWN);
+        assertCapturedEventsNoHistory();
+    }
+
+    private static MotionEvent fromTouchscreen(MotionEvent ev) {
+        ev.setSource(InputDevice.SOURCE_TOUCHSCREEN);
+        return ev;
+    }
+
+    private static PointF p(int x, int y) {
+        return new PointF(x, y);
+    }
+
+    private static String stateToString(int state) {
+        return DebugUtils.valueToString(TouchExplorerTest.class, "STATE_", state);
+    }
+
+    private void goFromStateIdleTo(int state) {
+        try {
+            switch (state) {
+                case STATE_TOUCH_EXPLORING: {
+                    mTouchExplorer.onDestroy();
+                }
+                break;
+                case STATE_TOUCH_EXPLORING_1FINGER: {
+                    goFromStateIdleTo(STATE_TOUCH_EXPLORING);
+                    send(downEvent());
+                }
+                break;
+                case STATE_TOUCH_EXPLORING_2FINGER: {
+                    goFromStateIdleTo(STATE_TOUCH_EXPLORING_1FINGER);
+                    send(pointerDownEvent());
+                }
+                break;
+                case STATE_TOUCH_EXPLORING_3FINGER: {
+                    goFromStateIdleTo(STATE_TOUCH_EXPLORING_2FINGER);
+                    send(thirdPointerDownEvent());
+                }
+                break;
+                case STATE_MOVING_2FINGERS: {
+                    goFromStateIdleTo(STATE_TOUCH_EXPLORING_2FINGER);
+                    moveEachPointers(mLastEvent, p(10, 0), p(5, 10));
+                    send(mLastEvent);
+                }
+                break;
+                case STATE_DRAGGING_2FINGERS: {
+                    goFromStateIdleTo(STATE_TOUCH_EXPLORING_2FINGER);
+                    moveEachPointers(mLastEvent, p(10, 0), p(10, 0));
+                    send(mLastEvent);
+                }
+                break;
+                case STATE_PINCH_2FINGERS: {
+                    goFromStateIdleTo(STATE_DRAGGING_2FINGERS);
+                    moveEachPointers(mLastEvent, p(10, 0), p(-10, 1));
+                    send(mLastEvent);
+                }
+                break;
+                case STATE_MOVING_3FINGERS: {
+                    goFromStateIdleTo(STATE_TOUCH_EXPLORING_3FINGER);
+                    moveEachPointers(mLastEvent, p(1, 0), p(1, 0), p(1, 0));
+                    send(mLastEvent);
+                }
+                break;
+                default:
+                    throw new IllegalArgumentException("Illegal state: " + state);
+            }
+        } catch (Throwable t) {
+            throw new RuntimeException("Failed to go to state " + stateToString(state), t);
+        }
+    }
+
+    private void send(MotionEvent event) {
+        final MotionEvent sendEvent = fromTouchscreen(event);
+        mLastEvent = sendEvent;
+        try {
+            mTouchExplorer.onMotionEvent(sendEvent, sendEvent, /* policyFlags */ 0);
+        } catch (Throwable t) {
+            throw new RuntimeException("Exception while handling " + sendEvent, t);
+        }
+    }
+
+    private void assertState(int expect) {
+        final String expectState = "STATE_" + stateToString(expect);
+        assertTrue(String.format("Expect state: %s, but: %s", expectState, mTouchExplorer),
+                mTouchExplorer.toString().contains(expectState));
+    }
+
+    private void assertCapturedEvents(int... actionsInOrder) {
+        final int eventCount = actionsInOrder.length;
+        assertEquals(eventCount, getCapturedEvents().size());
+        for (int i = 0; i < eventCount; i++) {
+            assertEquals(actionsInOrder[eventCount - i - 1], getCapturedEvent(i).getActionMasked());
+        }
+    }
+
+    private void assertCapturedEventsNoHistory() {
+        for (MotionEvent e : getCapturedEvents()) {
+            assertEquals(0, e.getHistorySize());
+        }
+    }
+
+    private MotionEvent getCapturedEvent(int index) {
+        return getCapturedEvents().get(index);
+    }
+
+    private List<MotionEvent> getCapturedEvents() {
+        return ((EventCaptor) mCaptor).mEvents;
+    }
+
+    private MotionEvent downEvent() {
+        mLastDownTime = SystemClock.uptimeMillis();
+        return fromTouchscreen(
+                MotionEvent.obtain(mLastDownTime, mLastDownTime, MotionEvent.ACTION_DOWN, DEFAULT_X,
+                        DEFAULT_Y, 0));
+    }
+
+    private MotionEvent pointerDownEvent() {
+        final int secondPointerId = 0x0100;
+        final int action = MotionEvent.ACTION_POINTER_DOWN | secondPointerId;
+        final float[] x = new float[]{DEFAULT_X, DEFAULT_X + 29};
+        final float[] y = new float[]{DEFAULT_Y, DEFAULT_Y + 28};
+        return manyPointerEvent(action, x, y);
+    }
+
+    private MotionEvent thirdPointerDownEvent() {
+        final int thirdPointerId = 0x0200;
+        final int action = MotionEvent.ACTION_POINTER_DOWN | thirdPointerId;
+        final float[] x = new float[]{DEFAULT_X, DEFAULT_X + 29, DEFAULT_X + 59};
+        final float[] y = new float[]{DEFAULT_Y, DEFAULT_Y + 28, DEFAULT_Y + 58};
+        return manyPointerEvent(action, x, y);
+    }
+
+    private void moveEachPointers(MotionEvent event, PointF... points) {
+        final float[] x = new float[points.length];
+        final float[] y = new float[points.length];
+        for (int i = 0; i < points.length; i++) {
+            x[i] = event.getX(i) + points[i].x;
+            y[i] = event.getY(i) + points[i].y;
+        }
+        MotionEvent newEvent = manyPointerEvent(MotionEvent.ACTION_MOVE, x, y);
+        event.setAction(MotionEvent.ACTION_MOVE);
+        // add history count
+        event.addBatch(newEvent);
+    }
+
+    private MotionEvent manyPointerEvent(int action, float[] x, float[] y) {
+        return manyPointerEvent(action, x, y, mLastDownTime);
+    }
+
+    private MotionEvent manyPointerEvent(int action, float[] x, float[] y, long downTime) {
+        final int len = x.length;
+
+        final MotionEvent.PointerProperties[] pp = new MotionEvent.PointerProperties[len];
+        for (int i = 0; i < len; i++) {
+            MotionEvent.PointerProperties pointerProperty = new MotionEvent.PointerProperties();
+            pointerProperty.id = i;
+            pointerProperty.toolType = MotionEvent.TOOL_TYPE_FINGER;
+            pp[i] = pointerProperty;
+        }
+
+        final MotionEvent.PointerCoords[] pc = new MotionEvent.PointerCoords[len];
+        for (int i = 0; i < len; i++) {
+            MotionEvent.PointerCoords pointerCoord = new MotionEvent.PointerCoords();
+            pointerCoord.x = x[i];
+            pointerCoord.y = y[i];
+            pc[i] = pointerCoord;
+        }
+
+        return MotionEvent.obtain(
+                /* downTime */ SystemClock.uptimeMillis(),
+                /* eventTime */ downTime,
+                /* action */ action,
+                /* pointerCount */ pc.length,
+                /* pointerProperties */ pp,
+                /* pointerCoords */ pc,
+                /* metaState */ 0,
+                /* buttonState */ 0,
+                /* xPrecision */ 1.0f,
+                /* yPrecision */ 1.0f,
+                /* deviceId */ 0,
+                /* edgeFlags */ 0,
+                /* source */ InputDevice.SOURCE_TOUCHSCREEN,
+                /* flags */ 0);
+    }
+}
diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java b/services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java
index 20df2ae..1aa80c8 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java
@@ -33,9 +33,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
@@ -46,7 +44,6 @@
 import android.app.WaitResult;
 import android.graphics.Rect;
 import android.platform.test.annotations.Presubmit;
-import android.util.SparseIntArray;
 
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
@@ -54,7 +51,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.invocation.InvocationOnMock;
 
 import java.util.ArrayList;
 
@@ -246,22 +242,6 @@
                 null /* target */, null /* targetOptions */);
     }
 
-    @Test
-    public void testTopRunningActivityLockedWithNonExistentDisplay() throws Exception {
-        // Create display that ActivityManagerService does not know about
-        final int unknownDisplayId = 100;
-
-        doAnswer((InvocationOnMock invocationOnMock) -> {
-            final SparseIntArray displayIds = invocationOnMock.<SparseIntArray>getArgument(0);
-            displayIds.put(0, 0);
-            displayIds.put(1, unknownDisplayId);
-            return null;
-        }).when(mSupervisor.mWindowManager).getDisplaysInFocusOrder(any());
-
-        // Supervisor should skip over the non-existent display.
-        assertEquals(null, mSupervisor.topRunningActivityLocked());
-    }
-
     /**
      * Verifies that removal of activity with task and stack is done correctly.
      */
@@ -339,12 +319,6 @@
         final ActivityRecord activity = new ActivityBuilder(mService).setCreateTask(true)
                 .setStack(stack).build();
 
-        doAnswer((InvocationOnMock invocationOnMock) -> {
-            final SparseIntArray displayIds = invocationOnMock.<SparseIntArray>getArgument(0);
-            displayIds.put(0, display.mDisplayId);
-            return null;
-        }).when(mSupervisor.mWindowManager).getDisplaysInFocusOrder(any());
-
         // Make sure the top running activity is not affected when keyguard is not locked
         assertEquals(activity, mService.mStackSupervisor.topRunningActivityLocked());
         assertEquals(activity, mService.mStackSupervisor.topRunningActivityLocked(
diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
index 9c0b525..aef5537 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
@@ -35,7 +35,6 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
 
 import android.app.ActivityManagerInternal;
 import android.app.ActivityOptions;
@@ -45,7 +44,6 @@
 import com.android.server.wm.DisplayWindowController;
 
 import org.junit.Rule;
-import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 
 import android.app.IApplicationThread;
@@ -63,26 +61,22 @@
 import android.os.UserHandle;
 import android.service.voice.IVoiceInteractionSession;
 import android.testing.DexmakerShareClassLoaderRule;
-import android.util.SparseIntArray;
 
 import androidx.test.InstrumentationRegistry;
 
 import com.android.internal.app.IVoiceInteractor;
 import com.android.server.AttributeCache;
 import com.android.server.wm.AppWindowContainerController;
-import com.android.server.wm.DisplayWindowController;
 import com.android.server.wm.PinnedStackWindowController;
+import com.android.server.wm.RootWindowContainerController;
 import com.android.server.wm.StackWindowController;
 import com.android.server.wm.TaskWindowContainerController;
 import com.android.server.wm.WindowManagerService;
 import com.android.server.wm.WindowTestUtils;
-import com.android.server.uri.UriGrantsManagerInternal;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
 
 import java.util.List;
 
@@ -500,13 +494,14 @@
                     (DisplayManager) mService.mContext.getSystemService(Context.DISPLAY_SERVICE);
             mWindowManager = prepareMockWindowManager();
             mKeyguardController = mock(KeyguardController.class);
+            setWindowContainerController(mock(RootWindowContainerController.class));
         }
 
         @Override
         public void initialize() {
             super.initialize();
             mDisplay = spy(new TestActivityDisplay(this, DEFAULT_DISPLAY));
-            attachDisplay(mDisplay);
+            addChild(mDisplay, ActivityDisplay.POSITION_TOP);
         }
 
         @Override
@@ -576,12 +571,6 @@
             return null;
         }).when(service).inSurfaceTransaction(any());
 
-        doAnswer((InvocationOnMock invocationOnMock) -> {
-            final SparseIntArray displayIds = invocationOnMock.<SparseIntArray>getArgument(0);
-            displayIds.put(0, 0);
-            return null;
-        }).when(service).getDisplaysInFocusOrder(any());
-
         return service;
     }
 
diff --git a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
index ba82487..5195214 100644
--- a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
@@ -872,8 +872,8 @@
             super.initialize();
             mDisplay = new TestActivityDisplay(this, DEFAULT_DISPLAY);
             mOtherDisplay = new TestActivityDisplay(this, DEFAULT_DISPLAY);
-            attachDisplay(mOtherDisplay);
-            attachDisplay(mDisplay);
+            addChild(mOtherDisplay, ActivityDisplay.POSITION_TOP);
+            addChild(mDisplay, ActivityDisplay.POSITION_TOP);
         }
 
         @Override
@@ -1045,7 +1045,7 @@
 
         @Override
         void getTasks(int maxNum, List<RunningTaskInfo> list, int ignoreActivityType,
-                int ignoreWindowingMode, SparseArray<ActivityDisplay> activityDisplays,
+                int ignoreWindowingMode, ArrayList<ActivityDisplay> activityDisplays,
                 int callingUid, boolean allowed) {
             lastAllowed = allowed;
             super.getTasks(maxNum, list, ignoreActivityType, ignoreWindowingMode, activityDisplays,
diff --git a/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java b/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java
index 283c027..d56c6a6 100644
--- a/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java
@@ -68,9 +68,9 @@
     public void testCollectTasksByLastActiveTime() throws Exception {
         // Create a number of stacks with tasks (of incrementing active time)
         final ActivityStackSupervisor supervisor = mService.mStackSupervisor;
-        final SparseArray<ActivityDisplay> displays = new SparseArray<>();
+        final ArrayList<ActivityDisplay> displays = new ArrayList<>();
         final ActivityDisplay display = new TestActivityDisplay(supervisor, DEFAULT_DISPLAY);
-        displays.put(DEFAULT_DISPLAY, display);
+        displays.add(display);
 
         final int numStacks = 2;
         for (int stackIndex = 0; stackIndex < numStacks; stackIndex++) {
diff --git a/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
index 0d40c5e..b330304 100644
--- a/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
+++ b/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
@@ -446,24 +446,6 @@
         assertEquals(anotherAlwaysOnTopStack, mDisplayContent.getStacks().get(topPosition - 1));
     }
 
-    /**
-     * Test that WM does not report displays to AM that are pending to be removed.
-     */
-    @Test
-    public void testDontReportDeferredRemoval() {
-        // Create a display and add an animating window to it.
-        final DisplayContent dc = createNewDisplay();
-        final WindowState window = createWindow(null /* parent */, TYPE_BASE_APPLICATION, dc, "w");
-        window.mAnimatingExit = true;
-        // Request display removal, it should be deferred.
-        dc.removeIfPossible();
-        // Request ordered display ids from WM.
-        final SparseIntArray orderedDisplayIds = new SparseIntArray();
-        sWm.getDisplaysInFocusOrder(orderedDisplayIds);
-        // Make sure that display that is marked for removal is not reported.
-        assertEquals(-1, orderedDisplayIds.indexOfValue(dc.getDisplayId()));
-    }
-
     @Test
     public void testDisplayCutout_rot0() throws Exception {
         synchronized (sWm.getWindowManagerLock()) {
diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowManagerServiceRule.java b/services/tests/servicestests/src/com/android/server/wm/WindowManagerServiceRule.java
index 6664756..54fd7db 100644
--- a/services/tests/servicestests/src/com/android/server/wm/WindowManagerServiceRule.java
+++ b/services/tests/servicestests/src/com/android/server/wm/WindowManagerServiceRule.java
@@ -111,7 +111,7 @@
                     doReturn(input[1]).when(ims).monitorInput(anyString());
                 }
 
-                mService = WindowManagerService.main(context, ims, true, false,
+                mService = WindowManagerService.main(context, ims, false,
                         false, mPolicy = new TestWindowManagerPolicy(
                                 WindowManagerServiceRule.this::getWindowManagerService));
 
diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java
index 645015f..5a42a84 100644
--- a/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java
+++ b/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java
@@ -39,28 +39,30 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-import android.graphics.Rect;
+import android.graphics.Matrix;
 import android.platform.test.annotations.Presubmit;
 import android.view.SurfaceControl;
 import android.view.WindowManager;
 
-import androidx.test.filters.FlakyTest;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.LinkedList;
 
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
 /**
  * Tests for the {@link WindowState} class.
  *
@@ -361,23 +363,22 @@
         final SurfaceControl.Transaction t = mock(SurfaceControl.Transaction.class);
 
         app.mHasSurface = true;
-        app.mSurfaceControl = mock(SurfaceControl.class);
-        app.mWinAnimator.mSurfaceController = mock(WindowSurfaceController.class);
+        app.mToken.mSurfaceControl = mock(SurfaceControl.class);
         try {
             app.getFrameLw().set(10, 20, 60, 80);
 
-            app.seamlesslyRotate(t, ROTATION_0, ROTATION_90);
+            app.seamlesslyRotateIfAllowed(t, ROTATION_0, ROTATION_90, true);
 
             assertTrue(app.mSeamlesslyRotated);
-            assertEquals(new Rect(20, mDisplayInfo.logicalWidth - 60,
-                    80, mDisplayInfo.logicalWidth - 10), app.getFrameLw());
-
-            verify(t).setPosition(app.mSurfaceControl, app.getFrameLw().left, app.getFrameLw().top);
-            verify(app.mWinAnimator.mSurfaceController).setPosition(t, 0, 50, false);
-            verify(app.mWinAnimator.mSurfaceController).setMatrix(t, 0, -1, 1, 0, false);
+            Matrix matrix = new Matrix();
+            // Un-rotate 90 deg
+            matrix.setRotate(270);
+            // Translate it back to origin
+            matrix.postTranslate(0, mDisplayInfo.logicalWidth);
+            verify(t).setMatrix(eq(app.mToken.mSurfaceControl), eq(matrix), any(float[].class));
         } finally {
-            app.mSurfaceControl = null;
             app.mHasSurface = false;
+            app.mToken.mSurfaceControl = null;
         }
     }
 
diff --git a/services/usage/java/com/android/server/usage/AppStandbyController.java b/services/usage/java/com/android/server/usage/AppStandbyController.java
index 77cb749..02ad3a8 100644
--- a/services/usage/java/com/android/server/usage/AppStandbyController.java
+++ b/services/usage/java/com/android/server/usage/AppStandbyController.java
@@ -1433,6 +1433,8 @@
                     + "): " + mCarrierPrivilegedApps);
         }
 
+        final long now = System.currentTimeMillis();
+
         pw.println();
         pw.println("Settings:");
 
@@ -1493,7 +1495,7 @@
         pw.print(" mCharging="); pw.print(mCharging);
         pw.print(" mChargingStable="); pw.print(mChargingStable);
         pw.print(" mLastAppIdleParoledTime=");
-        TimeUtils.formatDuration(mLastAppIdleParoledTime, pw);
+        TimeUtils.formatDuration(now - mLastAppIdleParoledTime, pw);
         pw.println();
         pw.print("mScreenThresholds="); pw.println(Arrays.toString(mAppStandbyScreenThresholds));
         pw.print("mElapsedThresholds="); pw.println(Arrays.toString(mAppStandbyElapsedThresholds));
diff --git a/services/usage/java/com/android/server/usage/StorageStatsService.java b/services/usage/java/com/android/server/usage/StorageStatsService.java
index 61d6b7d..d12eda75 100644
--- a/services/usage/java/com/android/server/usage/StorageStatsService.java
+++ b/services/usage/java/com/android/server/usage/StorageStatsService.java
@@ -155,8 +155,6 @@
 
     @Override
     public boolean isQuotaSupported(String volumeUuid, String callingPackage) {
-        enforcePermission(Binder.getCallingUid(), callingPackage);
-
         try {
             return mInstaller.isQuotaSupported(volumeUuid);
         } catch (InstallerException e) {
@@ -166,8 +164,6 @@
 
     @Override
     public boolean isReservedSupported(String volumeUuid, String callingPackage) {
-        enforcePermission(Binder.getCallingUid(), callingPackage);
-
         if (volumeUuid == StorageManager.UUID_PRIVATE_INTERNAL) {
             return SystemProperties.getBoolean(StorageManager.PROP_HAS_RESERVED, false);
         } else {
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 63945a9..57f1668 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -280,8 +280,8 @@
         }
         mControlFds.put(UsbManager.FUNCTION_MTP, mtpFd);
         FileDescriptor ptpFd = nativeOpenControl(UsbManager.USB_FUNCTION_PTP);
-        if (mtpFd == null) {
-            Slog.e(TAG, "Failed to open control for mtp");
+        if (ptpFd == null) {
+            Slog.e(TAG, "Failed to open control for ptp");
         }
         mControlFds.put(UsbManager.FUNCTION_PTP, ptpFd);
 
diff --git a/telecomm/OWNERS b/telecomm/OWNERS
index a3bcfb2..673a0a9 100644
--- a/telecomm/OWNERS
+++ b/telecomm/OWNERS
@@ -4,3 +4,4 @@
 breadley@google.com
 hallliu@google.com
 rgreenwalt@google.com
+paulye@google.com
diff --git a/telecomm/java/android/telecom/CallRedirectionService.java b/telecomm/java/android/telecom/CallRedirectionService.java
index 9c874bf..b906d0b 100644
--- a/telecomm/java/android/telecom/CallRedirectionService.java
+++ b/telecomm/java/android/telecom/CallRedirectionService.java
@@ -63,6 +63,10 @@
     /**
      * Telecom calls this method to inform the implemented {@link CallRedirectionService} of
      * a new outgoing call which is being placed.
+     *
+     * The implemented {@link CallRedirectionService} can call {@link #placeCallUnmodified()},
+     * {@link #redirectCall(Uri, PhoneAccountHandle)}, and {@link #cancelCall()} only from here.
+     *
      * @param handle the phone number dialed by the user
      * @param targetPhoneAccount the {@link PhoneAccountHandle} on which the call will be placed.
      */
@@ -72,6 +76,9 @@
      * The implemented {@link CallRedirectionService} calls this method to response a request
      * received via {@link #onPlaceCall(Uri, PhoneAccountHandle)} to inform Telecom that no changes
      * are required to the outgoing call, and that the call should be placed as-is.
+     *
+     * This can only be called from implemented {@link #onPlaceCall(Uri, PhoneAccountHandle)}.
+     *
      */
     public final void placeCallUnmodified() {
         try {
@@ -84,6 +91,9 @@
      * The implemented {@link CallRedirectionService} calls this method to response a request
      * received via {@link #onPlaceCall(Uri, PhoneAccountHandle)} to inform Telecom that changes
      * are required to the phone number or/and {@link PhoneAccountHandle} for the outgoing call.
+     *
+     * This can only be called from implemented {@link #onPlaceCall(Uri, PhoneAccountHandle)}.
+     *
      * @param handle the new phone number to dial
      * @param targetPhoneAccount the {@link PhoneAccountHandle} to use when placing the call.
      *                           If {@code null}, no change will be made to the
@@ -100,6 +110,9 @@
      * The implemented {@link CallRedirectionService} calls this method to response a request
      * received via {@link #onPlaceCall(Uri, PhoneAccountHandle)} to inform Telecom that an outgoing
      * call should be canceled entirely.
+     *
+     * This can only be called from implemented {@link #onPlaceCall(Uri, PhoneAccountHandle)}.
+     *
      */
     public final void cancelCall() {
         try {
@@ -144,7 +157,6 @@
         @Override
         public void placeCall(ICallRedirectionAdapter adapter, Uri handle,
                               PhoneAccountHandle targetPhoneAccount) {
-            Log.v(this, "placeCall");
             SomeArgs args = SomeArgs.obtain();
             args.arg1 = adapter;
             args.arg2 = handle;
@@ -154,14 +166,12 @@
     }
 
     @Override
-    public IBinder onBind(Intent intent) {
-        Log.v(this, "onBind");
+    public final IBinder onBind(Intent intent) {
         return new CallRedirectionBinder();
     }
 
     @Override
-    public boolean onUnbind(Intent intent) {
-        Log.v(this, "onUnbind");
+    public final boolean onUnbind(Intent intent) {
         return false;
     }
 }
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index d25e59f..9a4ea9e7 100644
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Represents a distinct method to place or receive a phone call. Apps which can place calls and
@@ -360,6 +361,33 @@
     private boolean mIsEnabled;
     private String mGroupId;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PhoneAccount that = (PhoneAccount) o;
+        return mCapabilities == that.mCapabilities &&
+                mHighlightColor == that.mHighlightColor &&
+                mSupportedAudioRoutes == that.mSupportedAudioRoutes &&
+                mIsEnabled == that.mIsEnabled &&
+                Objects.equals(mAccountHandle, that.mAccountHandle) &&
+                Objects.equals(mAddress, that.mAddress) &&
+                Objects.equals(mSubscriptionAddress, that.mSubscriptionAddress) &&
+                Objects.equals(mLabel, that.mLabel) &&
+                Objects.equals(mShortDescription, that.mShortDescription) &&
+                Objects.equals(mSupportedUriSchemes, that.mSupportedUriSchemes) &&
+                areBundlesEqual(mExtras, that.mExtras) &&
+                Objects.equals(mGroupId, that.mGroupId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(mAccountHandle, mAddress, mSubscriptionAddress, mCapabilities,
+                mHighlightColor, mLabel, mShortDescription, mSupportedUriSchemes,
+                mSupportedAudioRoutes,
+                mExtras, mIsEnabled, mGroupId);
+    }
+
     /**
      * Helper class for creating a {@link PhoneAccount}.
      */
@@ -1022,4 +1050,31 @@
 
         return sb.toString();
     }
+
+    /**
+     * Determines if two {@link Bundle}s are equal.
+     * @param extras First {@link Bundle} to check.
+     * @param newExtras {@link Bundle} to compare against.
+     * @return {@code true} if the {@link Bundle}s are equal, {@code false} otherwise.
+     */
+    private static boolean areBundlesEqual(Bundle extras, Bundle newExtras) {
+        if (extras == null || newExtras == null) {
+            return extras == newExtras;
+        }
+
+        if (extras.size() != newExtras.size()) {
+            return false;
+        }
+
+        for(String key : extras.keySet()) {
+            if (key != null) {
+                final Object value = extras.get(key);
+                final Object newValue = newExtras.get(key);
+                if (!Objects.equals(value, newValue)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 }
diff --git a/telephony/OWNERS b/telephony/OWNERS
index 6f67bc2..054288b 100644
--- a/telephony/OWNERS
+++ b/telephony/OWNERS
@@ -12,3 +12,4 @@
 satk@google.com
 shuoq@google.com
 refuhoo@google.com
+paulye@google.com
diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index b9de374..ed84788 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -1190,7 +1190,10 @@
              *
              * <p>Requires {@code android.Manifest.permission#CONTROL_INCALL_EXPERIENCE} to
              * send and receive.</p>
+             * @deprecated it is no longer supported, use {@link
+             * TelephonyManager#ACTION_SECRET_CODE} instead
              */
+            @Deprecated
             @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
             public static final String SECRET_CODE_ACTION =
                     "android.provider.Telephony.SECRET_CODE";
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 97068a6..8703e65 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -520,19 +520,19 @@
             "carrier_wfc_supports_wifi_only_bool";
 
     /**
-     * Default WFC_IMS_MODE for home network   0: WIFI_ONLY
-     *                                         1: CELLULAR_PREFERRED
-     *                                         2: WIFI_PREFERRED
-     * @hide
+     * Default mode for WFC over IMS on home network:
+     * <ul>
+     *   <li>0: Wi-Fi only
+     *   <li>1: prefer mobile network
+     *   <li>2: prefer Wi-Fi
+     * </ul>
      */
     public static final String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT =
             "carrier_default_wfc_ims_mode_int";
 
     /**
-     * Default WFC_IMS_MODE for roaming
-     * See {@link KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} for valid values.
-     *
-     * @hide
+     * Default mode for WFC over IMS on roaming network.
+     * See {@link #KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} for meaning of values.
      */
     public static final String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT =
             "carrier_default_wfc_ims_roaming_mode_int";
@@ -1994,18 +1994,25 @@
      * the binding intent go to.
      * @hide
      */
-    public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING
-             = "carrier_network_service_wlan_package_override_string";
+    public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING =
+            "carrier_network_service_wlan_package_override_string";
 
     /**
      * Decides when clients try to bind to wwan (cellular) network service, which package name will
      * the binding intent go to.
      * @hide
      */
-    public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING
-            = "carrier_network_service_wwan_package_override_string";
+    public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING =
+            "carrier_network_service_wwan_package_override_string";
 
     /**
+     * The package name of qualified networks service that telephony binds to.
+     *
+     * @hide
+     */
+    public static final String KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING =
+            "carrier_qualified_networks_service_package_override_string";
+    /**
      * A list of 4 LTE RSCP thresholds above which a signal level is considered POOR,
      * MODERATE, GOOD, or EXCELLENT, to be used in SignalStrength reporting.
      *
@@ -2049,6 +2056,13 @@
      */
     public static final String KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING =
             "call_redirection_service_component_name_string";
+    /**
+     * Support for the original string display of CDMA MO call.
+     * By default, it is disabled.
+     * @hide
+     */
+    public static final String KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL =
+            "config_show_orig_dial_string_for_cdma";
 
     /** The default value for every variable. */
     private final static PersistableBundle sDefaults;
@@ -2094,6 +2108,7 @@
         sDefaults.putBoolean(KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL, true);
         sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, "");
         sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, "");
+        sDefaults.putString(KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING, "");
         sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, "");
         sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, "");
         sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, "");
@@ -2382,6 +2397,7 @@
                         -85  /* SIGNAL_STRENGTH_GREAT */
                 });
         sDefaults.putString(KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING, "");
+        sDefaults.putBoolean(KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL, false);
     }
 
     /**
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 2ee1a09..f2b73dc 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -353,9 +353,11 @@
         mIsDataRoamingFromRegistration = s.mIsDataRoamingFromRegistration;
         mIsUsingCarrierAggregation = s.mIsUsingCarrierAggregation;
         mChannelNumber = s.mChannelNumber;
-        mCellBandwidths = Arrays.copyOf(s.mCellBandwidths, s.mCellBandwidths.length);
+        mCellBandwidths = s.mCellBandwidths == null ? null :
+                Arrays.copyOf(s.mCellBandwidths, s.mCellBandwidths.length);
         mLteEarfcnRsrpBoost = s.mLteEarfcnRsrpBoost;
-        mNetworkRegistrationStates = new ArrayList<>(s.mNetworkRegistrationStates);
+        mNetworkRegistrationStates = s.mNetworkRegistrationStates == null ? null :
+                new ArrayList<>(s.mNetworkRegistrationStates);
     }
 
     /**
@@ -812,7 +814,9 @@
                 && mIsEmergencyOnly == s.mIsEmergencyOnly
                 && mIsDataRoamingFromRegistration == s.mIsDataRoamingFromRegistration
                 && mIsUsingCarrierAggregation == s.mIsUsingCarrierAggregation)
-                && mNetworkRegistrationStates.containsAll(s.mNetworkRegistrationStates);
+                && (mNetworkRegistrationStates == null ? s.mNetworkRegistrationStates == null :
+                        s.mNetworkRegistrationStates != null &&
+                        mNetworkRegistrationStates.containsAll(s.mNetworkRegistrationStates));
     }
 
     /**
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 81d0d68..abcdeed 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2498,6 +2498,25 @@
             "android.telephony.action.SIM_SLOT_STATUS_CHANGED";
 
     /**
+     * Broadcast Action: A debug code has been entered in the dialer.
+     * <p>
+     * This intent is broadcast by the system and OEM telephony apps may need to receive these
+     * broadcasts. And it requires the sender to be default dialer or has carrier privileges
+     * (see {@link #hasCarrierPrivileges}).
+     * <p>
+     * These "secret codes" are used to activate developer menus by dialing certain codes.
+     * And they are of the form {@code *#*#&lt;code&gt;#*#*}. The intent will have the data
+     * URI: {@code android_secret_code://&lt;code&gt;}. It is possible that a manifest
+     * receiver would be woken up even if it is not currently running.
+     * <p>
+     * It is supposed to replace {@link android.provider.Telephony.Sms.Intents#SECRET_CODE_ACTION}
+     * in the next Android version.
+     * Before that both of these two actions will be broadcast.
+     */
+    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+    public static final String ACTION_SECRET_CODE = "android.telephony.action.SECRET_CODE";
+
+    /**
      * @return true if a ICC card is present
      */
     public boolean hasIccCard() {
@@ -2843,9 +2862,11 @@
     }
 
     /**
-     * Return if the current radio is LTE on CDMA. This
-     * is a tri-state return value as for a period of time
-     * the mode may be unknown.
+     * Return if the current radio is LTE on CDMA. This is a tri-state return value as for a period
+     * of time the mode may be unknown.
+     *
+     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
+     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
      *
      * @return {@link PhoneConstants#LTE_ON_CDMA_UNKNOWN}, {@link PhoneConstants#LTE_ON_CDMA_FALSE}
      * or {@link PhoneConstants#LTE_ON_CDMA_TRUE}
@@ -5630,6 +5651,9 @@
     /**
      * Sets the network selection mode to automatic.
      *
+     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
+     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
+     *
      * <p>Requires Permission:
      * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling
      * app has carrier privileges (see {@link #hasCarrierPrivileges}).
@@ -5652,27 +5676,36 @@
     /**
      * Perform a radio scan and return the list of available networks.
      *
-     * The return value is a list of the OperatorInfo of the networks found. Note that this
-     * scan can take a long time (sometimes minutes) to happen.
+     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
+     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
+     *
+     * <p> Note that this scan can take a long time (sometimes minutes) to happen.
      *
      * <p>Requires Permission:
-     * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling
-     * app has carrier privileges (see {@link #hasCarrierPrivileges}).
+     * {@link android.Manifest.permission#MODIFY_PHONE_STATE} or that the calling app has carrier
+     * privileges (see {@link #hasCarrierPrivileges})
+     *
+     * @return {@link CellNetworkScanResult} with the status
+     * {@link CellNetworkScanResult#STATUS_SUCCESS} and a list of
+     * {@link com.android.internal.telephony.OperatorInfo} if it's available. Otherwise, the failure
+     * caused will be included in the result.
      *
      * @hide
-     * TODO: Add an overload that takes no args.
      */
-    public CellNetworkScanResult getCellNetworkScanResults(int subId) {
+    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
+    public CellNetworkScanResult getAvailableNetworks() {
         try {
             ITelephony telephony = getITelephony();
-            if (telephony != null)
-                return telephony.getCellNetworkScanResults(subId);
+            if (telephony != null) {
+                return telephony.getCellNetworkScanResults(getSubId());
+            }
         } catch (RemoteException ex) {
-            Rlog.e(TAG, "getCellNetworkScanResults RemoteException", ex);
+            Rlog.e(TAG, "getAvailableNetworks RemoteException", ex);
         } catch (NullPointerException ex) {
-            Rlog.e(TAG, "getCellNetworkScanResults NPE", ex);
+            Rlog.e(TAG, "getAvailableNetworks NPE", ex);
         }
-        return null;
+        return new CellNetworkScanResult(
+                CellNetworkScanResult.STATUS_UNKNOWN_ERROR, null /* OperatorInfo */);
     }
 
     /**
@@ -5722,6 +5755,9 @@
     /**
      * Ask the radio to connect to the input network and change selection mode to manual.
      *
+     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
+     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
+     *
      * <p>Requires Permission:
      * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling
      * app has carrier privileges (see {@link #hasCarrierPrivileges}).
@@ -6180,7 +6216,11 @@
         }
     }
 
-    /** @hide */
+    /**
+     * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead
+     * @hide
+     */
+    @Deprecated
     @SystemApi
     @RequiresPermission(anyOf = {
             android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6197,7 +6237,11 @@
         return false;
     }
 
-    /** @hide */
+    /**
+     * @deprecated Use {@link android.telecom.TelecomManager#isRinging} instead
+     * @hide
+     */
+    @Deprecated
     @SystemApi
     @RequiresPermission(anyOf = {
             android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6214,7 +6258,11 @@
         return false;
     }
 
-    /** @hide */
+    /**
+     * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead
+     * @hide
+     */
+    @Deprecated
     @SystemApi
     @RequiresPermission(anyOf = {
             android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6231,7 +6279,11 @@
         return true;
     }
 
-    /** @hide */
+    /**
+     * @deprecated Use {@link android.telephony.TelephonyManager#getServiceState} instead
+     * @hide
+     */
+    @Deprecated
     @SystemApi
     @RequiresPermission(anyOf = {
             android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6601,9 +6653,9 @@
      * subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
      *
      * <p>Requires one of the following permissions:
-     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE ACCESS_NETWORK_STATE},
-     * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}, or that the
-     * calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
+     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE},
+     * {@link android.Manifest.permission#MODIFY_PHONE_STATE}, or that the calling app has carrier
+     * privileges (see {@link #hasCarrierPrivileges}).
      *
      * <p>Note that this does not take into account any data restrictions that may be present on the
      * calling app. Such restrictions may be inspected with
@@ -6611,11 +6663,69 @@
      *
      * @return true if mobile data is enabled.
      */
+    @RequiresPermission(anyOf = {android.Manifest.permission.ACCESS_NETWORK_STATE,
+            android.Manifest.permission.MODIFY_PHONE_STATE})
     public boolean isDataEnabled() {
         return getDataEnabled(getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));
     }
 
     /**
+     * Returns whether mobile data roaming is enabled on the subscription.
+     *
+     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
+     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
+     *
+     * <p>Requires one of the following permissions:
+     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE},
+     * {@link android.Manifest.permission#READ_PHONE_STATE} or that the calling app
+     * has carrier privileges (see {@link #hasCarrierPrivileges}).
+     *
+     * @return {@code true} if the data roaming is enabled on the subscription, otherwise return
+     * {@code false}.
+     */
+    @RequiresPermission(anyOf = {android.Manifest.permission.ACCESS_NETWORK_STATE,
+            android.Manifest.permission.READ_PHONE_STATE})
+    public boolean isDataRoamingEnabled() {
+        boolean isDataRoamingEnabled = false;
+        try {
+            ITelephony telephony = getITelephony();
+            if (telephony != null) {
+                isDataRoamingEnabled = telephony.isDataRoamingEnabled(getSubId());
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "Error calling ITelephony#isDataRoamingEnabled", e);
+        }
+        return isDataRoamingEnabled;
+    }
+
+    /**
+     * Enables/Disables the data roaming on the subscription.
+     *
+     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
+     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
+     *
+     * <p> Requires permission:
+     * {@link android.Manifest.permission#MODIFY_PHONE_STATE} or that the calling app has carrier
+     * privileges (see {@link #hasCarrierPrivileges}).
+     *
+     * @param isEnabled {@code true} to enable mobile data roaming, otherwise disable it.
+     *
+     * @hide
+     */
+    @SystemApi
+    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
+    public void setDataRoamingEnabled(boolean isEnabled) {
+        try {
+            ITelephony telephony = getITelephony();
+            if (telephony != null) {
+                telephony.setDataRoamingEnabled(getSubId(), isEnabled);
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "Error calling ITelephony#setDataRoamingEnabled", e);
+        }
+    }
+
+    /**
      * @deprecated use {@link #isDataEnabled()} instead.
      * @hide
      */
@@ -7400,6 +7510,9 @@
     /**
      * Returns the current {@link ServiceState} information.
      *
+     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
+     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
+     *
      * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
      * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
      */
@@ -7867,8 +7980,12 @@
     }
 
     /**
-     * Check if phone is in emergency callback mode
-     * @return true if phone is in emergency callback mode
+     * Checks if phone is in emergency callback mode.
+     *
+     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
+     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
+     *
+     * @return true if phone is in emergency callback mode.
      * @hide
      */
     @SystemApi
diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index 5dc0cff..c2c93da 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -811,7 +811,7 @@
             version = 1;
         }
 
-        String[] a = data.split("\\s*,\\s*");
+        String[] a = data.split("\\s*,\\s*", -1);
         if (a.length < 14) {
             return null;
         }
diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java
index b981f05..8fcdb6e 100644
--- a/telephony/java/android/telephony/ims/ImsReasonInfo.java
+++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java
@@ -185,6 +185,15 @@
     public static final int CODE_EMERGENCY_PERM_FAILURE = 364;
 
     /**
+     * Call failure code during hangup/reject if user marked the call as unwanted.
+     *
+     * Android Telephony will receive information whether ROBO call feature is supported by the
+     * network from modem and propagate the same to AOSP as new ImsCallProfile members. OEMs can
+     * check this information and provide an option to the user to mark the call as unwanted.
+     */
+    public static final int CODE_SIP_USER_MARKED_UNWANTED = 365;
+
+    /**
      * MEDIA (IMS -> Telephony)
      */
     // Media resource initialization failed
@@ -403,6 +412,12 @@
     public static final int CODE_UNOBTAINABLE_NUMBER = 1515;
 
     /**
+     * Call failed because WiFi call could not complete and circuit switch silent redial
+     * is not allowed while roaming on another network.
+     */
+    public static final int CODE_NO_CSFB_IN_CS_ROAM = 1516;
+
+    /**
      * The rejection cause is not known.
      * <p>
      * Used with implicit call rejection.
diff --git a/telephony/java/com/android/internal/telephony/CallerInfo.java b/telephony/java/com/android/internal/telephony/CallerInfo.java
index f646028..0abe45c 100644
--- a/telephony/java/com/android/internal/telephony/CallerInfo.java
+++ b/telephony/java/com/android/internal/telephony/CallerInfo.java
@@ -16,6 +16,7 @@
 
 package com.android.internal.telephony;
 
+import android.annotation.UnsupportedAppUsage;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
@@ -83,7 +84,9 @@
      * field here, NOT name.  We're NOT always guaranteed to have a name
      * for a connection, but the number should be displayable.
      */
+    @UnsupportedAppUsage
     public String name;
+    @UnsupportedAppUsage
     public String phoneNumber;
     public String normalizedNumber;
     public String geoDescription;
@@ -95,12 +98,15 @@
 
     public String phoneLabel;
     /* Split up the phoneLabel into number type and label name */
+    @UnsupportedAppUsage
     public int    numberType;
+    @UnsupportedAppUsage
     public String numberLabel;
 
     public int photoResource;
 
     // Contact ID, which will be 0 if a contact comes from the corp CP2.
+    @UnsupportedAppUsage
     public long contactIdOrZero;
     public boolean needUpdate;
     public Uri contactRefUri;
@@ -155,6 +161,7 @@
     private boolean mIsEmergency;
     private boolean mIsVoiceMail;
 
+    @UnsupportedAppUsage
     public CallerInfo() {
         // TODO: Move all the basic initialization here?
         mIsEmergency = false;
@@ -300,6 +307,7 @@
      * @return the CallerInfo which contains the caller id for the given
      * number. The returned CallerInfo is null if no number is supplied.
      */
+    @UnsupportedAppUsage
     public static CallerInfo getCallerInfo(Context context, Uri contactRef) {
         CallerInfo info = null;
         ContentResolver cr = CallerInfoAsyncQuery.getCurrentProfileContentResolver(context);
@@ -324,6 +332,7 @@
      * a matching number is not found, then a generic caller info is returned,
      * with all relevant fields empty or null.
      */
+    @UnsupportedAppUsage
     public static CallerInfo getCallerInfo(Context context, String number) {
         if (VDBG) Rlog.v(TAG, "getCallerInfo() based on number...");
 
@@ -342,6 +351,7 @@
      * a matching number is not found, then a generic caller info is returned,
      * with all relevant fields empty or null.
      */
+    @UnsupportedAppUsage
     public static CallerInfo getCallerInfo(Context context, String number, int subId) {
 
         if (TextUtils.isEmpty(number)) {
diff --git a/telephony/java/com/android/internal/telephony/EncodeException.java b/telephony/java/com/android/internal/telephony/EncodeException.java
index 0436ba0..4e3fac1 100644
--- a/telephony/java/com/android/internal/telephony/EncodeException.java
+++ b/telephony/java/com/android/internal/telephony/EncodeException.java
@@ -16,6 +16,8 @@
 
 package com.android.internal.telephony;
 
+import android.annotation.UnsupportedAppUsage;
+
 /**
  * {@hide}
  */
@@ -24,10 +26,12 @@
         super();
     }
 
+    @UnsupportedAppUsage
     public EncodeException(String s) {
         super(s);
     }
 
+    @UnsupportedAppUsage
     public EncodeException(char c) {
         super("Unencodable char: '" + c + "'");
     }
diff --git a/telephony/java/com/android/internal/telephony/GsmAlphabet.java b/telephony/java/com/android/internal/telephony/GsmAlphabet.java
index 4785169..69ff329 100644
--- a/telephony/java/com/android/internal/telephony/GsmAlphabet.java
+++ b/telephony/java/com/android/internal/telephony/GsmAlphabet.java
@@ -20,6 +20,7 @@
 import android.text.TextUtils;
 import android.util.SparseIntArray;
 
+import android.annotation.UnsupportedAppUsage;
 import android.telephony.Rlog;
 
 import java.nio.ByteBuffer;
@@ -84,6 +85,7 @@
         /**
          *The number of SMS's required to encode the text.
          */
+        @UnsupportedAppUsage
         public int msgCount;
 
         /**
@@ -92,28 +94,33 @@
          * septets for the standard ASCII and GSM encodings, and 16
          * bits for Unicode.
          */
+        @UnsupportedAppUsage
         public int codeUnitCount;
 
         /**
          * How many code units are still available without spilling
          * into an additional message.
          */
+        @UnsupportedAppUsage
         public int codeUnitsRemaining;
 
         /**
          * The encoding code unit size (specified using
          * android.telephony.SmsMessage ENCODING_*).
          */
+        @UnsupportedAppUsage
         public int codeUnitSize;
 
         /**
          * The GSM national language table to use, or 0 for the default 7-bit alphabet.
          */
+        @UnsupportedAppUsage
         public int languageTable;
 
         /**
          * The GSM national language shift table to use, or 0 for the default 7-bit extension table.
          */
+        @UnsupportedAppUsage
         public int languageShiftTable;
 
         @Override
@@ -138,6 +145,7 @@
      * @param c the character to convert
      * @return the GSM 7 bit table index for the specified character
      */
+    @UnsupportedAppUsage
     public static int
     charToGsm(char c) {
         try {
@@ -160,6 +168,7 @@
      * @throws EncodeException encode error when throwException is true
      * @return the GSM 7 bit table index for the specified character
      */
+    @UnsupportedAppUsage
     public static int
     charToGsm(char c, boolean throwException) throws EncodeException {
         int ret;
@@ -215,6 +224,7 @@
      * @param gsmChar the GSM 7 bit table index to convert
      * @return the decoded character
      */
+    @UnsupportedAppUsage
     public static char
     gsmToChar(int gsmChar) {
         if (gsmChar >= 0 && gsmChar < 128) {
@@ -293,6 +303,7 @@
      * @return Byte array containing header and encoded data.
      * @throws EncodeException if String is too large to encode
      */
+    @UnsupportedAppUsage
     public static byte[] stringToGsm7BitPackedWithHeader(String data, byte[] header,
             int languageTable, int languageShiftTable)
             throws EncodeException {
@@ -327,6 +338,7 @@
      * @return the encoded string
      * @throws EncodeException if String is too large to encode
      */
+    @UnsupportedAppUsage
     public static byte[] stringToGsm7BitPacked(String data)
             throws EncodeException {
         return stringToGsm7BitPacked(data, 0, true, 0, 0);
@@ -377,6 +389,7 @@
      *
      * @throws EncodeException if String is too large to encode
      */
+    @UnsupportedAppUsage
     public static byte[] stringToGsm7BitPacked(String data, int startingSeptetOffset,
             boolean throwException, int languageTable, int languageShiftTable)
             throws EncodeException {
@@ -428,6 +441,7 @@
      *                  (septet index * 7)
      * @param value the 7-bit character to store
      */
+    @UnsupportedAppUsage
     private static void
     packSmsChar(byte[] packedChars, int bitOffset, int value) {
         int byteOffset = bitOffset / 8;
@@ -451,6 +465,7 @@
      * @param lengthSeptets string length in septets, not bytes
      * @return String representation or null on decoding exception
      */
+    @UnsupportedAppUsage
     public static String gsm7BitPackedToString(byte[] pdu, int offset,
             int lengthSeptets) {
         return gsm7BitPackedToString(pdu, offset, lengthSeptets, 0, 0, 0);
@@ -472,6 +487,7 @@
      *     GSM extension table
      * @return String representation or null on decoding exception
      */
+    @UnsupportedAppUsage
     public static String gsm7BitPackedToString(byte[] pdu, int offset,
             int lengthSeptets, int numPaddingBits, int languageTable, int shiftTable) {
         StringBuilder ret = new StringBuilder(lengthSeptets);
@@ -555,6 +571,7 @@
      * @param length the number of bytes to decode
      * @return the decoded string
      */
+    @UnsupportedAppUsage
     public static String
     gsm8BitUnpackedToString(byte[] data, int offset, int length) {
         return gsm8BitUnpackedToString(data, offset, length, "");
@@ -570,6 +587,7 @@
      * Additionally, in some country(ex. Korea), there are non-ASCII or MBCS characters.
      * If a character set is given, characters in data are treat as MBCS.
      */
+    @UnsupportedAppUsage
     public static String
     gsm8BitUnpackedToString(byte[] data, int offset, int length, String characterset) {
         boolean isMbcs = false;
@@ -649,6 +667,7 @@
      * @param s the string to encode
      * @return the 8-bit GSM encoded byte array for the string
      */
+    @UnsupportedAppUsage
     public static byte[]
     stringToGsm8BitPacked(String s) {
         byte[] ret;
@@ -736,6 +755,7 @@
      * @return the number of septets for this character
      * @throws EncodeException the character can't be encoded and throwsException is true
      */
+    @UnsupportedAppUsage
     public static int
     countGsmSeptets(char c, boolean throwsException) throws EncodeException {
         if (sCharsToGsmTables[0].get(c, -1) != -1) {
@@ -978,6 +998,7 @@
      * @return index of first character that won't fit, or the length
      *   of the entire string if everything fits
      */
+    @UnsupportedAppUsage
     public static int
     findGsmSeptetLimitIndex(String s, int start, int limit, int langTable, int langShiftTable) {
         int accumulator = 0;
@@ -1076,18 +1097,23 @@
     }
 
     /** Reverse mapping from Unicode characters to indexes into language tables. */
+    @UnsupportedAppUsage
     private static final SparseIntArray[] sCharsToGsmTables;
 
     /** Reverse mapping from Unicode characters to indexes into language shift tables. */
+    @UnsupportedAppUsage
     private static final SparseIntArray[] sCharsToShiftTables;
 
     /** OEM configured list of enabled national language single shift tables for encoding. */
+    @UnsupportedAppUsage
     private static int[] sEnabledSingleShiftTables;
 
     /** OEM configured list of enabled national language locking shift tables for encoding. */
+    @UnsupportedAppUsage
     private static int[] sEnabledLockingShiftTables;
 
     /** Highest language code to include in array of single shift counters. */
+    @UnsupportedAppUsage
     private static int sHighestEnabledSingleShiftCode;
 
     /** Flag to bypass check for country-specific overlays (for test cases only). */
@@ -1098,9 +1124,13 @@
      * the single shift tables that it can be paired with.
      */
     private static class LanguagePairCount {
+        @UnsupportedAppUsage
         final int languageCode;
+        @UnsupportedAppUsage
         final int[] septetCounts;
+        @UnsupportedAppUsage
         final int[] unencodableCounts;
+        @UnsupportedAppUsage
         LanguagePairCount(int code) {
             this.languageCode = code;
             int maxSingleShiftCode = sHighestEnabledSingleShiftCode;
@@ -1130,6 +1160,7 @@
      * GSM default 7 bit alphabet plus national language locking shift character tables.
      * Comment lines above strings indicate the lower four bits of the table position.
      */
+    @UnsupportedAppUsage
     private static final String[] sLanguageTables = {
         /* 3GPP TS 23.038 V9.1.1 section 6.2.1 - GSM 7 bit Default Alphabet
          01.....23.....4.....5.....6.....7.....8.....9.....A.B.....C.....D.E.....F.....0.....1 */
@@ -1323,6 +1354,7 @@
     /**
      * GSM default extension table plus national language single shift character tables.
      */
+    @UnsupportedAppUsage
     private static final String[] sLanguageShiftTables = new String[]{
         /* 6.2.1.1 GSM 7 bit Default Alphabet Extension Table
          0123456789A.....BCDEF0123456789ABCDEF0123456789ABCDEF.0123456789ABCDEF0123456789ABCDEF */
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index c59a739..a7e5581 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -1514,6 +1514,22 @@
     void setRadioIndicationUpdateMode(int subId, int filters, int mode);
 
     /**
+     * Returns whether mobile data roaming is enabled on the subscription with id {@code subId}.
+     *
+     * @param subId the subscription id
+     * @return {@code true} if the data roaming is enabled on this subscription.
+     */
+    boolean isDataRoamingEnabled(int subId);
+
+    /**
+     * Enables/Disables the data roaming on the subscription with id {@code subId}.
+     *
+     * @param subId the subscription id
+     * @param isEnabled {@code true} to enable mobile data roaming, otherwise disable it.
+     */
+    void setDataRoamingEnabled(int subId, boolean isEnabled);
+
+    /**
      * A test API to override carrier information including mccmnc, imsi, iccid, gid1, gid2,
      * plmn and spn. This would be handy for, eg, forcing a particular carrier id, carrier's config
      * (also any country or carrier overlays) to be loaded when using a test SIM with a call box.
diff --git a/telephony/java/com/android/internal/telephony/OperatorInfo.java b/telephony/java/com/android/internal/telephony/OperatorInfo.java
index a29d7c1..d0245a0 100644
--- a/telephony/java/com/android/internal/telephony/OperatorInfo.java
+++ b/telephony/java/com/android/internal/telephony/OperatorInfo.java
@@ -16,6 +16,7 @@
 
 package com.android.internal.telephony;
 
+import android.annotation.UnsupportedAppUsage;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -26,37 +27,48 @@
     public enum State {
         UNKNOWN,
         AVAILABLE,
+        @UnsupportedAppUsage
         CURRENT,
+        @UnsupportedAppUsage
         FORBIDDEN;
     }
 
+    @UnsupportedAppUsage
     private String mOperatorAlphaLong;
+    @UnsupportedAppUsage
     private String mOperatorAlphaShort;
+    @UnsupportedAppUsage
     private String mOperatorNumeric;
 
+    @UnsupportedAppUsage
     private State mState = State.UNKNOWN;
 
 
+    @UnsupportedAppUsage
     public String
     getOperatorAlphaLong() {
         return mOperatorAlphaLong;
     }
 
+    @UnsupportedAppUsage
     public String
     getOperatorAlphaShort() {
         return mOperatorAlphaShort;
     }
 
+    @UnsupportedAppUsage
     public String
     getOperatorNumeric() {
         return mOperatorNumeric;
     }
 
+    @UnsupportedAppUsage
     public State
     getState() {
         return mState;
     }
 
+    @UnsupportedAppUsage
     OperatorInfo(String operatorAlphaLong,
                 String operatorAlphaShort,
                 String operatorNumeric,
@@ -70,6 +82,7 @@
     }
 
 
+    @UnsupportedAppUsage
     public OperatorInfo(String operatorAlphaLong,
                 String operatorAlphaShort,
                 String operatorNumeric,
@@ -78,6 +91,7 @@
                 operatorNumeric, rilStateToState(stateString));
     }
 
+    @UnsupportedAppUsage
     public OperatorInfo(String operatorAlphaLong,
             String operatorAlphaShort,
             String operatorNumeric) {
@@ -87,6 +101,7 @@
     /**
      * See state strings defined in ril.h RIL_REQUEST_QUERY_AVAILABLE_NETWORKS
      */
+    @UnsupportedAppUsage
     private static State rilStateToState(String s) {
         if (s.equals("unknown")) {
             return State.UNKNOWN;
@@ -140,6 +155,7 @@
      * Implement the Parcelable interface
      * Method to deserialize a OperatorInfo object, or an array thereof.
      */
+    @UnsupportedAppUsage
     public static final Creator<OperatorInfo> CREATOR =
         new Creator<OperatorInfo>() {
             @Override
diff --git a/telephony/java/com/android/internal/telephony/SmsAddress.java b/telephony/java/com/android/internal/telephony/SmsAddress.java
index b3892cb..2a8de8c 100644
--- a/telephony/java/com/android/internal/telephony/SmsAddress.java
+++ b/telephony/java/com/android/internal/telephony/SmsAddress.java
@@ -16,6 +16,8 @@
 
 package com.android.internal.telephony;
 
+import android.annotation.UnsupportedAppUsage;
+
 public abstract class SmsAddress {
     // From TS 23.040 9.1.2.5 and TS 24.008 table 10.5.118
     // and C.S0005-D table 2.7.1.3.2.4-2
@@ -29,6 +31,7 @@
 
     public int ton;
     public String address;
+    @UnsupportedAppUsage
     public byte[] origBytes;
 
     /**
diff --git a/telephony/java/com/android/internal/telephony/SmsConstants.java b/telephony/java/com/android/internal/telephony/SmsConstants.java
index 0aba468..19f52b0 100644
--- a/telephony/java/com/android/internal/telephony/SmsConstants.java
+++ b/telephony/java/com/android/internal/telephony/SmsConstants.java
@@ -15,6 +15,8 @@
  */
 package com.android.internal.telephony;
 
+import android.annotation.UnsupportedAppUsage;
+
 /**
  * SMS Constants and must be the same as the corresponding
  * deprecated version in SmsMessage.
@@ -58,10 +60,15 @@
      * See TS 23.038.
      */
     public enum MessageClass{
+        @UnsupportedAppUsage
         UNKNOWN,
+        @UnsupportedAppUsage
         CLASS_0,
+        @UnsupportedAppUsage
         CLASS_1,
+        @UnsupportedAppUsage
         CLASS_2,
+        @UnsupportedAppUsage
         CLASS_3;
     }
 
diff --git a/telephony/java/com/android/internal/telephony/SmsHeader.java b/telephony/java/com/android/internal/telephony/SmsHeader.java
index b519b70..9fe1718 100644
--- a/telephony/java/com/android/internal/telephony/SmsHeader.java
+++ b/telephony/java/com/android/internal/telephony/SmsHeader.java
@@ -22,6 +22,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import android.annotation.UnsupportedAppUsage;
 import java.util.ArrayList;
 
 /**
@@ -72,14 +73,19 @@
     public static final int PORT_WAP_WSP  = 9200;
 
     public static class PortAddrs {
+        @UnsupportedAppUsage
         public int destPort;
+        @UnsupportedAppUsage
         public int origPort;
         public boolean areEightBits;
     }
 
     public static class ConcatRef {
+        @UnsupportedAppUsage
         public int refNumber;
+        @UnsupportedAppUsage
         public int seqNumber;
+        @UnsupportedAppUsage
         public int msgCount;
         public boolean isEightBits;
     }
@@ -98,17 +104,22 @@
         public byte[] data;
     }
 
+    @UnsupportedAppUsage
     public PortAddrs portAddrs;
+    @UnsupportedAppUsage
     public ConcatRef concatRef;
     public ArrayList<SpecialSmsMsg> specialSmsMsgList = new ArrayList<SpecialSmsMsg>();
     public ArrayList<MiscElt> miscEltList = new ArrayList<MiscElt>();
 
     /** 7 bit national language locking shift table, or 0 for GSM default 7 bit alphabet. */
+    @UnsupportedAppUsage
     public int languageTable;
 
     /** 7 bit national language single shift table, or 0 for GSM default 7 bit extension table. */
+    @UnsupportedAppUsage
     public int languageShiftTable;
 
+    @UnsupportedAppUsage
     public SmsHeader() {}
 
     /**
@@ -117,6 +128,7 @@
      * @param data is user data header bytes
      * @return SmsHeader object
      */
+    @UnsupportedAppUsage
     public static SmsHeader fromByteArray(byte[] data) {
         ByteArrayInputStream inStream = new ByteArrayInputStream(data);
         SmsHeader smsHeader = new SmsHeader();
@@ -198,6 +210,7 @@
      * (see TS 23.040 9.2.3.24)
      * @return Byte array representing the SmsHeader
      */
+    @UnsupportedAppUsage
     public static byte[] toByteArray(SmsHeader smsHeader) {
         if ((smsHeader.portAddrs == null) &&
             (smsHeader.concatRef == null) &&
diff --git a/telephony/java/com/android/internal/telephony/SmsMessageBase.java b/telephony/java/com/android/internal/telephony/SmsMessageBase.java
index e5821dc..7b1ead9 100644
--- a/telephony/java/com/android/internal/telephony/SmsMessageBase.java
+++ b/telephony/java/com/android/internal/telephony/SmsMessageBase.java
@@ -22,6 +22,7 @@
 import java.text.BreakIterator;
 import java.util.Arrays;
 
+import android.annotation.UnsupportedAppUsage;
 import android.provider.Telephony;
 import android.telephony.SmsMessage;
 import android.text.Emoji;
@@ -32,12 +33,15 @@
  */
 public abstract class SmsMessageBase {
     /** {@hide} The address of the SMSC. May be null */
+    @UnsupportedAppUsage
     protected String mScAddress;
 
     /** {@hide} The address of the sender */
+    @UnsupportedAppUsage
     protected SmsAddress mOriginatingAddress;
 
     /** {@hide} The message body as a string. May be null if the message isn't text */
+    @UnsupportedAppUsage
     protected String mMessageBody;
 
     /** {@hide} */
@@ -56,23 +60,28 @@
     protected long mScTimeMillis;
 
     /** {@hide} The raw PDU of the message */
+    @UnsupportedAppUsage
     protected byte[] mPdu;
 
     /** {@hide} The raw bytes for the user data section of the message */
     protected byte[] mUserData;
 
     /** {@hide} */
+    @UnsupportedAppUsage
     protected SmsHeader mUserDataHeader;
 
     // "Message Waiting Indication Group"
     // 23.038 Section 4
     /** {@hide} */
+    @UnsupportedAppUsage
     protected boolean mIsMwi;
 
     /** {@hide} */
+    @UnsupportedAppUsage
     protected boolean mMwiSense;
 
     /** {@hide} */
+    @UnsupportedAppUsage
     protected boolean mMwiDontStore;
 
     /**
@@ -86,11 +95,14 @@
     protected int mIndexOnIcc = -1;
 
     /** TP-Message-Reference - Message Reference of sent message. @hide */
+    @UnsupportedAppUsage
     public int mMessageRef;
 
     // TODO(): This class is duplicated in SmsMessage.java. Refactor accordingly.
     public static abstract class SubmitPduBase  {
+        @UnsupportedAppUsage
         public byte[] encodedScAddress; // Null if not applicable.
+        @UnsupportedAppUsage
         public byte[] encodedMessage;
 
         @Override
@@ -106,6 +118,7 @@
      * Returns the address of the SMS service center that relayed this message
      * or null if there is none.
      */
+    @UnsupportedAppUsage
     public String getServiceCenterAddress() {
         return mScAddress;
     }
@@ -114,6 +127,7 @@
      * Returns the originating address (sender) of this SMS message in String
      * form or null if unavailable
      */
+    @UnsupportedAppUsage
     public String getOriginatingAddress() {
         if (mOriginatingAddress == null) {
             return null;
@@ -127,6 +141,7 @@
      * was from an email gateway. Returns null if originating address
      * unavailable.
      */
+    @UnsupportedAppUsage
     public String getDisplayOriginatingAddress() {
         if (mIsEmail) {
             return mEmailFrom;
@@ -139,6 +154,7 @@
      * Returns the message body as a String, if it exists and is text based.
      * @return message body is there is one, otherwise null
      */
+    @UnsupportedAppUsage
     public String getMessageBody() {
         return mMessageBody;
     }
@@ -152,6 +168,7 @@
      * Returns the message body, or email message body if this message was from
      * an email gateway. Returns null if message body unavailable.
      */
+    @UnsupportedAppUsage
     public String getDisplayMessageBody() {
         if (mIsEmail) {
             return mEmailBody;
@@ -164,6 +181,7 @@
      * Unofficial convention of a subject line enclosed in parens empty string
      * if not present
      */
+    @UnsupportedAppUsage
     public String getPseudoSubject() {
         return mPseudoSubject == null ? "" : mPseudoSubject;
     }
@@ -171,6 +189,7 @@
     /**
      * Returns the service centre timestamp in currentTimeMillis() format
      */
+    @UnsupportedAppUsage
     public long getTimestampMillis() {
         return mScTimeMillis;
     }
@@ -204,12 +223,14 @@
     /**
      * Get protocol identifier.
      */
+    @UnsupportedAppUsage
     public abstract int getProtocolIdentifier();
 
     /**
      * See TS 23.040 9.2.3.9 returns true if this is a "replace short message"
      * SMS
      */
+    @UnsupportedAppUsage
     public abstract boolean isReplace();
 
     /**
@@ -242,6 +263,7 @@
      * returns the user data section minus the user data header if one was
      * present.
      */
+    @UnsupportedAppUsage
     public byte[] getUserData() {
         return mUserData;
     }
@@ -251,6 +273,7 @@
      *
      * {@hide}
      */
+    @UnsupportedAppUsage
     public SmsHeader getUserDataHeader() {
         return mUserDataHeader;
     }
@@ -279,17 +302,20 @@
      *         See TS 23.040, 9.9.2.3.15 for a description of other possible
      *         values.
      */
+    @UnsupportedAppUsage
     public abstract int getStatus();
 
     /**
      * Return true iff the message is a SMS-STATUS-REPORT message.
      */
+    @UnsupportedAppUsage
     public abstract boolean isStatusReportMessage();
 
     /**
      * Returns true iff the <code>TP-Reply-Path</code> bit is set in
      * this message.
      */
+    @UnsupportedAppUsage
     public abstract boolean isReplyPathPresent();
 
     /**
diff --git a/telephony/java/com/android/internal/telephony/SmsRawData.java b/telephony/java/com/android/internal/telephony/SmsRawData.java
index 891d942..18727f3 100644
--- a/telephony/java/com/android/internal/telephony/SmsRawData.java
+++ b/telephony/java/com/android/internal/telephony/SmsRawData.java
@@ -17,6 +17,7 @@
 
 package com.android.internal.telephony;
 
+import android.annotation.UnsupportedAppUsage;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -27,6 +28,7 @@
     byte[] data;
 
     //Static Methods
+    @UnsupportedAppUsage
     public static final Parcelable.Creator<SmsRawData> CREATOR
             = new Parcelable.Creator<SmsRawData> (){
         public SmsRawData createFromParcel(Parcel source) {
@@ -43,10 +45,12 @@
     };
 
     // Constructor
+    @UnsupportedAppUsage
     public SmsRawData(byte[] data) {
         this.data = data;
     }
 
+    @UnsupportedAppUsage
     public byte[] getBytes() {
         return data;
     }
diff --git a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
index bbe38b7..06378ba 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
@@ -20,7 +20,6 @@
 import android.Manifest;
 import android.app.AppOpsManager;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.os.Binder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -250,6 +249,26 @@
     }
 
     /**
+     * Ensure the caller (or self, if not processing an IPC) has
+     * {@link android.Manifest.permission#READ_PHONE_STATE} or carrier privileges.
+     *
+     * @throws SecurityException if the caller does not have the required permission/privileges
+     */
+    public static void enforeceCallingOrSelfReadPhoneStatePermissionOrCarrierPrivilege(
+            Context context, int subId, String message) {
+        if (context.checkCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE)
+                == PERMISSION_GRANTED) {
+            return;
+        }
+
+        if (DBG) {
+            Rlog.d(LOG_TAG, "No READ_PHONE_STATE permission, check carrier privilege next.");
+        }
+
+        enforceCallingOrSelfCarrierPrivilege(subId, message);
+    }
+
+    /**
      * Make sure the caller (or self, if not processing an IPC) has carrier privileges.
      *
      * @throws SecurityException if the caller does not have the required privileges
diff --git a/test-mock/api/current.txt b/test-mock/api/current.txt
index f3b253c..fc9b4c6 100644
--- a/test-mock/api/current.txt
+++ b/test-mock/api/current.txt
@@ -292,6 +292,7 @@
     method public int getColor(int) throws android.content.res.Resources.NotFoundException;
     method public android.content.res.ColorStateList getColorStateList(int) throws android.content.res.Resources.NotFoundException;
     method public android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException;
+    method public android.graphics.Movie getMovie(int) throws android.content.res.Resources.NotFoundException;
     method public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
   }
 
diff --git a/tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java b/tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java
index e509d2d..fd20f4a 100644
--- a/tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java
+++ b/tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java
@@ -154,6 +154,8 @@
             stdout.append(new String(buf, 0, bytesRead));
         }
         fis.close();
+        Log.i(TAG, "stdout");
+        Log.i(TAG, stdout.toString());
         return stdout.toString();
     }
 
@@ -202,7 +204,10 @@
 
     // TODO(aeubanks): figure out how to get scheduled bg-dexopt to run
     private static void runBackgroundDexOpt() throws IOException {
-        runShellCommand("cmd package bg-dexopt-job " + PACKAGE_NAME);
+        String result = runShellCommand("cmd package bg-dexopt-job " + PACKAGE_NAME);
+        if (!result.trim().equals("Success")) {
+            throw new IllegalStateException("Expected command success, received >" + result + "<");
+        }
     }
 
     // Set the time ahead of the last use time of the test app in days.
diff --git a/tests/net/java/android/net/dhcp/DhcpLeaseRepositoryTest.java b/tests/net/java/android/net/dhcp/DhcpLeaseRepositoryTest.java
index edadd6e..7f8e7b5 100644
--- a/tests/net/java/android/net/dhcp/DhcpLeaseRepositoryTest.java
+++ b/tests/net/java/android/net/dhcp/DhcpLeaseRepositoryTest.java
@@ -32,10 +32,11 @@
 import static java.net.InetAddress.parseNumericAddress;
 
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.net.IpPrefix;
 import android.net.MacAddress;
-import android.net.dhcp.DhcpLeaseRepository.Clock;
 import android.net.util.SharedLog;
+import android.net.dhcp.DhcpServer.Clock;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -107,7 +108,7 @@
             MacAddress newMac = MacAddress.fromBytes(hwAddrBytes);
             final String hostname = "host_" + i;
             final DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, newMac,
-                    INETADDR_UNSPEC /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, hostname);
+                    INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, hostname);
 
             assertNotNull(lease);
             assertEquals(newMac, lease.getHwAddr());
@@ -115,7 +116,7 @@
             assertTrue(format("Duplicate address allocated: %s in %s", lease.getNetAddr(), addrs),
                     addrs.add(lease.getNetAddr()));
 
-            mRepo.requestLease(null, newMac, null, lease.getNetAddr(), true, hostname);
+            requestLeaseSelecting(newMac, lease.getNetAddr(), hostname);
         }
     }
 
@@ -129,7 +130,7 @@
 
         try {
             mRepo.getOffer(null, TEST_MAC_2,
-                    null /* relayAddr */, null /* reqAddr */, HOSTNAME_NONE);
+                    INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
             fail("Should be out of addresses");
         } catch (DhcpLeaseRepository.OutOfAddressesException e) {
             // Expected
@@ -145,8 +146,7 @@
         // Inside /28, but not available there (first address of the range)
         final Inet4Address declinedFirstAddrIn28 = parseAddr4("192.168.42.240");
 
-        final DhcpLease reqAddrIn28Lease = mRepo.requestLease(
-                CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY, reqAddrIn28, false, HOSTNAME_NONE);
+        final DhcpLease reqAddrIn28Lease = requestLeaseSelecting(TEST_MAC_1, reqAddrIn28);
         mRepo.markLeaseDeclined(declinedAddrIn28);
         mRepo.markLeaseDeclined(declinedFirstAddrIn28);
 
@@ -154,14 +154,12 @@
         final Inet4Address reqAddrIn22 = parseAddr4("192.168.42.3");
         final Inet4Address declinedAddrIn22 = parseAddr4("192.168.42.4");
 
-        final DhcpLease reqAddrIn22Lease = mRepo.requestLease(
-                CLIENTID_UNSPEC, TEST_MAC_3, INET4_ANY, reqAddrIn22, false, HOSTNAME_NONE);
+        final DhcpLease reqAddrIn22Lease = requestLeaseSelecting(TEST_MAC_3, reqAddrIn22);
         mRepo.markLeaseDeclined(declinedAddrIn22);
 
         // Address that will be reserved in the updateParams call below
         final Inet4Address reservedAddr = parseAddr4("192.168.42.244");
-        final DhcpLease reservedAddrLease = mRepo.requestLease(
-                CLIENTID_UNSPEC, TEST_MAC_2, INET4_ANY, reservedAddr, false, HOSTNAME_NONE);
+        final DhcpLease reservedAddrLease = requestLeaseSelecting(TEST_MAC_2, reservedAddr);
 
         // Update from /22 to /28 and add another reserved address
         Set<Inet4Address> newReserved = new HashSet<>(TEST_EXCL_SET);
@@ -183,11 +181,11 @@
     public void testGetOffer_StableAddress() throws Exception {
         for (final MacAddress macAddr : new MacAddress[] { TEST_MAC_1, TEST_MAC_2, TEST_MAC_3 }) {
             final DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, macAddr,
-                    INETADDR_UNSPEC /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
+                    INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
 
             // Same lease is offered twice
             final DhcpLease newLease = mRepo.getOffer(CLIENTID_UNSPEC, macAddr,
-                    INETADDR_UNSPEC /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
+                    INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
             assertEquals(lease, newLease);
         }
     }
@@ -198,17 +196,16 @@
         mRepo.updateParams(newPrefix, TEST_EXCL_SET, TEST_LEASE_TIME_MS);
 
         DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1,
-                INETADDR_UNSPEC, INETADDR_UNSPEC, HOSTNAME_NONE);
+                INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
         assertTrue(newPrefix.contains(lease.getNetAddr()));
     }
 
     @Test
     public void testGetOffer_ExistingLease() throws Exception {
-        mRepo.requestLease(
-                CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY, TEST_INETADDR_1, false, TEST_HOSTNAME_1);
+        requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1, TEST_HOSTNAME_1);
 
         DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1,
-                INETADDR_UNSPEC, INETADDR_UNSPEC, HOSTNAME_NONE);
+                INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
         assertEquals(TEST_INETADDR_1, offer.getNetAddr());
         assertEquals(TEST_HOSTNAME_1, offer.getHostname());
     }
@@ -216,12 +213,12 @@
     @Test
     public void testGetOffer_ClientIdHasExistingLease() throws Exception {
         final byte[] clientId = new byte[] { 1, 2 };
-        mRepo.requestLease(clientId, TEST_MAC_1, INET4_ANY, TEST_INETADDR_1, false,
-                TEST_HOSTNAME_1);
+        mRepo.requestLease(clientId, TEST_MAC_1, INET4_ANY /* clientAddr */,
+                INET4_ANY /* relayAddr */, TEST_INETADDR_1 /* reqAddr */, false, TEST_HOSTNAME_1);
 
         // Different MAC, but same clientId
         DhcpLease offer = mRepo.getOffer(clientId, TEST_MAC_2,
-                INETADDR_UNSPEC, INETADDR_UNSPEC, HOSTNAME_NONE);
+                INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
         assertEquals(TEST_INETADDR_1, offer.getNetAddr());
         assertEquals(TEST_HOSTNAME_1, offer.getHostname());
     }
@@ -230,12 +227,12 @@
     public void testGetOffer_DifferentClientId() throws Exception {
         final byte[] clientId1 = new byte[] { 1, 2 };
         final byte[] clientId2 = new byte[] { 3, 4 };
-        mRepo.requestLease(clientId1, TEST_MAC_1, INET4_ANY, TEST_INETADDR_1, false,
-                TEST_HOSTNAME_1);
+        mRepo.requestLease(clientId1, TEST_MAC_1, INET4_ANY /* clientAddr */,
+                INET4_ANY /* relayAddr */, TEST_INETADDR_1 /* reqAddr */, false, TEST_HOSTNAME_1);
 
         // Same MAC, different client ID
         DhcpLease offer = mRepo.getOffer(clientId2, TEST_MAC_1,
-                INETADDR_UNSPEC, INETADDR_UNSPEC, HOSTNAME_NONE);
+                INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
         // Obtains a different address
         assertNotEquals(TEST_INETADDR_1, offer.getNetAddr());
         assertEquals(HOSTNAME_NONE, offer.getHostname());
@@ -244,58 +241,57 @@
 
     @Test
     public void testGetOffer_RequestedAddress() throws Exception {
-        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_INETADDR_1, TEST_HOSTNAME_1);
+        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* relayAddr */,
+                TEST_INETADDR_1 /* reqAddr */, TEST_HOSTNAME_1);
         assertEquals(TEST_INETADDR_1, offer.getNetAddr());
         assertEquals(TEST_HOSTNAME_1, offer.getHostname());
     }
 
     @Test
     public void testGetOffer_RequestedAddressInUse() throws Exception {
-        mRepo.requestLease(
-                CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY, TEST_INETADDR_1, false, HOSTNAME_NONE);
-        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_2, INET4_ANY,
-                TEST_INETADDR_1, HOSTNAME_NONE);
+        requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1);
+        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_2, INET4_ANY /* relayAddr */,
+                TEST_INETADDR_1 /* reqAddr */, HOSTNAME_NONE);
         assertNotEquals(TEST_INETADDR_1, offer.getNetAddr());
     }
 
     @Test
     public void testGetOffer_RequestedAddressReserved() throws Exception {
-        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_RESERVED_ADDR, HOSTNAME_NONE);
+        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* relayAddr */,
+                TEST_RESERVED_ADDR /* reqAddr */, HOSTNAME_NONE);
         assertNotEquals(TEST_RESERVED_ADDR, offer.getNetAddr());
     }
 
     @Test
     public void testGetOffer_RequestedAddressInvalid() throws Exception {
         final Inet4Address invalidAddr = parseAddr4("192.168.42.0");
-        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                invalidAddr, HOSTNAME_NONE);
+        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* relayAddr */,
+                invalidAddr /* reqAddr */, HOSTNAME_NONE);
         assertNotEquals(invalidAddr, offer.getNetAddr());
     }
 
     @Test
     public void testGetOffer_RequestedAddressOutsideSubnet() throws Exception {
         final Inet4Address invalidAddr = parseAddr4("192.168.254.2");
-        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                invalidAddr, HOSTNAME_NONE);
+        DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* relayAddr */,
+                invalidAddr /* reqAddr */, HOSTNAME_NONE);
         assertNotEquals(invalidAddr, offer.getNetAddr());
     }
 
-    @Test(expected = DhcpLeaseRepository.InvalidAddressException.class)
+    @Test(expected = DhcpLeaseRepository.InvalidSubnetException.class)
     public void testGetOffer_RelayInInvalidSubnet() throws Exception {
-        mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1,
-                parseAddr4("192.168.254.2") /* relayAddr */, INETADDR_UNSPEC, HOSTNAME_NONE);
+        mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, parseAddr4("192.168.254.2") /* relayAddr */,
+                INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
     }
 
     @Test
     public void testRequestLease_SelectingTwice() throws Exception {
-        DhcpLease lease1 = mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_INETADDR_1, true /* sidSet */, TEST_HOSTNAME_1);
+        final DhcpLease lease1 = requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1,
+                TEST_HOSTNAME_1);
 
         // Second request from same client for a different address
-        DhcpLease lease2 = mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_INETADDR_2, true /* sidSet */, TEST_HOSTNAME_2);
+        final DhcpLease lease2 = requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_2,
+                TEST_HOSTNAME_2);
 
         assertEquals(TEST_INETADDR_1, lease1.getNetAddr());
         assertEquals(TEST_HOSTNAME_1, lease1.getHostname());
@@ -304,43 +300,43 @@
         assertEquals(TEST_HOSTNAME_2, lease2.getHostname());
 
         // First address freed when client requested a different one: another client can request it
-        DhcpLease lease3 = mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_2, INET4_ANY,
-                TEST_INETADDR_1, true /* sidSet */, HOSTNAME_NONE);
+        final DhcpLease lease3 = requestLeaseSelecting(TEST_MAC_2, TEST_INETADDR_1, HOSTNAME_NONE);
         assertEquals(TEST_INETADDR_1, lease3.getNetAddr());
     }
 
     @Test(expected = DhcpLeaseRepository.InvalidAddressException.class)
     public void testRequestLease_SelectingInvalid() throws Exception {
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                parseAddr4("192.168.254.5"), true /* sidSet */, HOSTNAME_NONE);
+        requestLeaseSelecting(TEST_MAC_1, parseAddr4("192.168.254.5"));
     }
 
     @Test(expected = DhcpLeaseRepository.InvalidAddressException.class)
     public void testRequestLease_SelectingInUse() throws Exception {
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_INETADDR_1, true /* sidSet */, HOSTNAME_NONE);
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_2, INET4_ANY,
-                TEST_INETADDR_1, true /* sidSet */, HOSTNAME_NONE);
+        requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1);
+        requestLeaseSelecting(TEST_MAC_2, TEST_INETADDR_1);
     }
 
     @Test(expected = DhcpLeaseRepository.InvalidAddressException.class)
     public void testRequestLease_SelectingReserved() throws Exception {
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_RESERVED_ADDR, true /* sidSet */, HOSTNAME_NONE);
+        requestLeaseSelecting(TEST_MAC_1, TEST_RESERVED_ADDR);
+    }
+
+    @Test(expected = DhcpLeaseRepository.InvalidSubnetException.class)
+    public void testRequestLease_SelectingRelayInInvalidSubnet() throws  Exception {
+        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* clientAddr */,
+                parseAddr4("192.168.128.1") /* relayAddr */, TEST_INETADDR_1 /* reqAddr */,
+                true /* sidSet */, HOSTNAME_NONE);
     }
 
     @Test
     public void testRequestLease_InitReboot() throws Exception {
         // Request address once
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_INETADDR_1, true /* sidSet */, HOSTNAME_NONE);
+        requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1);
 
         final long newTime = TEST_TIME + 100;
         when(mClock.elapsedRealtime()).thenReturn(newTime);
 
         // init-reboot (sidSet == false): verify configuration
-        DhcpLease lease = mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_INETADDR_1, false, HOSTNAME_NONE);
+        final DhcpLease lease = requestLeaseInitReboot(TEST_MAC_1, TEST_INETADDR_1);
         assertEquals(TEST_INETADDR_1, lease.getNetAddr());
         assertEquals(newTime + TEST_LEASE_TIME_MS, lease.getExpTime());
     }
@@ -348,18 +344,15 @@
     @Test(expected = DhcpLeaseRepository.InvalidAddressException.class)
     public void testRequestLease_InitRebootWrongAddr() throws Exception {
         // Request address once
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_INETADDR_1, true /* sidSet */, HOSTNAME_NONE);
+        requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1);
         // init-reboot with different requested address
-        mRepo.requestLease(
-                CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY, TEST_INETADDR_2, false, HOSTNAME_NONE);
+        requestLeaseInitReboot(TEST_MAC_1, TEST_INETADDR_2);
     }
 
     @Test
     public void testRequestLease_InitRebootUnknownAddr() throws Exception {
         // init-reboot with unknown requested address
-        DhcpLease lease = mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_INETADDR_2, false, HOSTNAME_NONE);
+        final DhcpLease lease = requestLeaseInitReboot(TEST_MAC_1, TEST_INETADDR_2);
         // RFC2131 says we should not reply to accommodate other servers, but since we are
         // authoritative we allow creating the lease to avoid issues with lost lease DB (same as
         // dnsmasq behavior)
@@ -368,22 +361,17 @@
 
     @Test(expected = DhcpLeaseRepository.InvalidAddressException.class)
     public void testRequestLease_InitRebootWrongSubnet() throws Exception {
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                parseAddr4("192.168.254.2"), false /* sidSet */, HOSTNAME_NONE);
+        requestLeaseInitReboot(TEST_MAC_1, parseAddr4("192.168.254.2"));
     }
 
     @Test
     public void testRequestLease_Renewing() throws Exception {
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1,
-                INET4_ANY /* clientAddr */, TEST_INETADDR_1 /* reqAddr */, true, HOSTNAME_NONE);
+        requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1);
 
         final long newTime = TEST_TIME + 100;
         when(mClock.elapsedRealtime()).thenReturn(newTime);
 
-        // Renewing: clientAddr filled in, no reqAddr
-        DhcpLease lease = mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1,
-                TEST_INETADDR_1 /* clientAddr */, INETADDR_UNSPEC /* reqAddr */, false,
-                HOSTNAME_NONE);
+        final DhcpLease lease = requestLeaseRenewing(TEST_MAC_1, TEST_INETADDR_1);
 
         assertEquals(TEST_INETADDR_1, lease.getNetAddr());
         assertEquals(newTime + TEST_LEASE_TIME_MS, lease.getExpTime());
@@ -393,9 +381,7 @@
     public void testRequestLease_RenewingUnknownAddr() throws Exception {
         final long newTime = TEST_TIME + 100;
         when(mClock.elapsedRealtime()).thenReturn(newTime);
-        DhcpLease lease = mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1,
-                TEST_INETADDR_1 /* clientAddr */, INETADDR_UNSPEC /* reqAddr */, false,
-                HOSTNAME_NONE);
+        final DhcpLease lease = requestLeaseRenewing(TEST_MAC_1, TEST_INETADDR_1);
         // Allows renewing an unknown address if available
         assertEquals(TEST_INETADDR_1, lease.getNetAddr());
         assertEquals(newTime + TEST_LEASE_TIME_MS, lease.getExpTime());
@@ -403,31 +389,24 @@
 
     @Test(expected = DhcpLeaseRepository.InvalidAddressException.class)
     public void testRequestLease_RenewingAddrInUse() throws Exception {
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_2,
-                INET4_ANY /* clientAddr */, TEST_INETADDR_1 /* reqAddr */, true, HOSTNAME_NONE);
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1,
-                TEST_INETADDR_1 /* clientAddr */, INETADDR_UNSPEC /* reqAddr */, false,
-                HOSTNAME_NONE);
+        requestLeaseSelecting(TEST_MAC_2, TEST_INETADDR_1);
+        requestLeaseRenewing(TEST_MAC_1, TEST_INETADDR_1);
     }
 
     @Test(expected = DhcpLeaseRepository.InvalidAddressException.class)
     public void testRequestLease_RenewingInvalidAddr() throws Exception {
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, parseAddr4("192.168.254.2") /* clientAddr */,
-                INETADDR_UNSPEC /* reqAddr */, false, HOSTNAME_NONE);
+        requestLeaseRenewing(TEST_MAC_1, parseAddr4("192.168.254.2"));
     }
 
     @Test
     public void testReleaseLease() throws Exception {
-        DhcpLease lease1 = mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY,
-                TEST_INETADDR_1, true /* sidSet */, HOSTNAME_NONE);
+        final DhcpLease lease1 = requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1);
 
         assertHasLease(lease1);
         assertTrue(mRepo.releaseLease(CLIENTID_UNSPEC, TEST_MAC_1, TEST_INETADDR_1));
         assertNoLease(lease1);
 
-        DhcpLease lease2 = mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_2, INET4_ANY,
-                TEST_INETADDR_1, true /* sidSet */, HOSTNAME_NONE);
-
+        final DhcpLease lease2 = requestLeaseSelecting(TEST_MAC_2, TEST_INETADDR_1);
         assertEquals(TEST_INETADDR_1, lease2.getNetAddr());
     }
 
@@ -440,15 +419,14 @@
     public void testReleaseLease_StableOffer() throws Exception {
         for (MacAddress mac : new MacAddress[] { TEST_MAC_1, TEST_MAC_2, TEST_MAC_3 }) {
             final DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, mac,
-                    INETADDR_UNSPEC /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
-            mRepo.requestLease(
-                    CLIENTID_UNSPEC, mac, INET4_ANY, lease.getNetAddr(), true,
-                    HOSTNAME_NONE);
+                    INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
+
+            requestLeaseSelecting(mac, lease.getNetAddr());
             mRepo.releaseLease(CLIENTID_UNSPEC, mac, lease.getNetAddr());
 
             // Same lease is offered after it was released
             final DhcpLease newLease = mRepo.getOffer(CLIENTID_UNSPEC, mac,
-                    INETADDR_UNSPEC /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
+                    INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
             assertEquals(lease.getNetAddr(), newLease.getNetAddr());
         }
     }
@@ -456,13 +434,13 @@
     @Test
     public void testMarkLeaseDeclined() throws Exception {
         final DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1,
-                INETADDR_UNSPEC /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
+                INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
 
         mRepo.markLeaseDeclined(lease.getNetAddr());
 
         // Same lease is not offered again
         final DhcpLease newLease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1,
-                INETADDR_UNSPEC /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
+                INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
         assertNotEquals(lease.getNetAddr(), newLease.getNetAddr());
     }
 
@@ -475,22 +453,20 @@
         mRepo.markLeaseDeclined(TEST_INETADDR_2);
 
         // /28 should have 16 addresses, 14 w/o the first/last, 11 w/o excluded addresses
-        requestAddresses((byte)9);
+        requestAddresses((byte) 9);
 
         // Last 2 addresses: addresses marked declined should be used
         final DhcpLease firstLease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1,
-                INETADDR_UNSPEC /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, TEST_HOSTNAME_1);
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY, firstLease.getNetAddr(), true,
-                HOSTNAME_NONE);
+                INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, TEST_HOSTNAME_1);
+        requestLeaseSelecting(TEST_MAC_1, firstLease.getNetAddr());
 
         final DhcpLease secondLease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_2,
-                INETADDR_UNSPEC /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, TEST_HOSTNAME_2);
-        mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_2, INET4_ANY, secondLease.getNetAddr(), true,
-                HOSTNAME_NONE);
+                INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, TEST_HOSTNAME_2);
+        requestLeaseSelecting(TEST_MAC_2, secondLease.getNetAddr());
 
         // Now out of addresses
         try {
-            mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_3, INETADDR_UNSPEC /* relayAddr */,
+            mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_3, INET4_ANY /* relayAddr */,
                     INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE);
             fail("Repository should be out of addresses and throw");
         } catch (DhcpLeaseRepository.OutOfAddressesException e) { /* expected */ }
@@ -501,6 +477,50 @@
         assertEquals(TEST_HOSTNAME_2, secondLease.getHostname());
     }
 
+    private DhcpLease requestLease(@NonNull MacAddress macAddr, @NonNull Inet4Address clientAddr,
+            @Nullable Inet4Address reqAddr, @Nullable String hostname, boolean sidSet)
+            throws DhcpLeaseRepository.DhcpLeaseException {
+        return mRepo.requestLease(CLIENTID_UNSPEC, macAddr, clientAddr, INET4_ANY /* relayAddr */,
+                reqAddr, sidSet, hostname);
+    }
+
+    /**
+     * Request a lease simulating a client in the SELECTING state.
+     */
+    private DhcpLease requestLeaseSelecting(@NonNull MacAddress macAddr,
+            @NonNull Inet4Address reqAddr, @Nullable String hostname)
+            throws DhcpLeaseRepository.DhcpLeaseException {
+        return requestLease(macAddr, INET4_ANY /* clientAddr */, reqAddr, hostname,
+                true /* sidSet */);
+    }
+
+    /**
+     * Request a lease simulating a client in the SELECTING state.
+     */
+    private DhcpLease requestLeaseSelecting(@NonNull MacAddress macAddr,
+            @NonNull Inet4Address reqAddr) throws DhcpLeaseRepository.DhcpLeaseException {
+        return requestLeaseSelecting(macAddr, reqAddr, HOSTNAME_NONE);
+    }
+
+    /**
+     * Request a lease simulating a client in the INIT-REBOOT state.
+     */
+    private DhcpLease requestLeaseInitReboot(@NonNull MacAddress macAddr,
+            @NonNull Inet4Address reqAddr) throws DhcpLeaseRepository.DhcpLeaseException {
+        return requestLease(macAddr, INET4_ANY /* clientAddr */, reqAddr, HOSTNAME_NONE,
+                false /* sidSet */);
+    }
+
+    /**
+     * Request a lease simulating a client in the RENEWING state.
+     */
+    private DhcpLease requestLeaseRenewing(@NonNull MacAddress macAddr,
+            @NonNull Inet4Address clientAddr) throws DhcpLeaseRepository.DhcpLeaseException {
+        // Renewing: clientAddr filled in, no reqAddr
+        return requestLease(macAddr, clientAddr, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE,
+                true /* sidSet */);
+    }
+
     private void assertNoLease(DhcpLease lease) {
         assertFalse("Leases contain " + lease, mRepo.getCommittedLeases().contains(lease));
     }
diff --git a/tests/net/java/android/net/dhcp/DhcpPacketTest.java b/tests/net/java/android/net/dhcp/DhcpPacketTest.java
index 050183c..312b3d1 100644
--- a/tests/net/java/android/net/dhcp/DhcpPacketTest.java
+++ b/tests/net/java/android/net/dhcp/DhcpPacketTest.java
@@ -16,6 +16,8 @@
 
 package android.net.dhcp;
 
+import static android.net.NetworkUtils.getBroadcastAddress;
+import static android.net.NetworkUtils.getPrefixMaskAsInet4Address;
 import static android.net.dhcp.DhcpPacket.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -29,14 +31,15 @@
 import android.net.metrics.DhcpErrorEvent;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.test.filters.SmallTest;
-import android.system.OsConstants;
 
 import com.android.internal.util.HexDump;
 
+import java.io.ByteArrayOutputStream;
 import java.net.Inet4Address;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Random;
 
 import org.junit.Before;
@@ -47,13 +50,17 @@
 @SmallTest
 public class DhcpPacketTest {
 
-    private static Inet4Address SERVER_ADDR = v4Address("192.0.2.1");
-    private static Inet4Address CLIENT_ADDR = v4Address("192.0.2.234");
+    private static final Inet4Address SERVER_ADDR = v4Address("192.0.2.1");
+    private static final Inet4Address CLIENT_ADDR = v4Address("192.0.2.234");
+    private static final int PREFIX_LENGTH = 22;
+    private static final Inet4Address NETMASK = getPrefixMaskAsInet4Address(PREFIX_LENGTH);
+    private static final Inet4Address BROADCAST_ADDR = getBroadcastAddress(
+            SERVER_ADDR, PREFIX_LENGTH);
     // Use our own empty address instead of Inet4Address.ANY or INADDR_ANY to ensure that the code
     // doesn't use == instead of equals when comparing addresses.
-    private static Inet4Address ANY = (Inet4Address) v4Address("0.0.0.0");
+    private static final Inet4Address ANY = (Inet4Address) v4Address("0.0.0.0");
 
-    private static byte[] CLIENT_MAC = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };
+    private static final byte[] CLIENT_MAC = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };
 
     private static final Inet4Address v4Address(String addrString) throws IllegalArgumentException {
         return (Inet4Address) NetworkUtils.numericToInetAddress(addrString);
@@ -952,4 +959,96 @@
                 "\nActual:\n  " + Arrays.toString(actual);
         assertTrue(msg, Arrays.equals(expected, actual));
     }
+
+    public void checkBuildOfferPacket(int leaseTimeSecs) throws Exception {
+        final int renewalTime = (int) (Integer.toUnsignedLong(leaseTimeSecs) / 2);
+        final int rebindingTime = (int) (Integer.toUnsignedLong(leaseTimeSecs) * 875 / 1000);
+        final int transactionId = 0xdeadbeef;
+
+        final ByteBuffer packet = DhcpPacket.buildOfferPacket(
+                DhcpPacket.ENCAP_BOOTP, transactionId, false /* broadcast */,
+                SERVER_ADDR, INADDR_ANY /* relayIp */, CLIENT_ADDR /* yourIp */,
+                CLIENT_MAC, leaseTimeSecs, NETMASK /* netMask */,
+                BROADCAST_ADDR /* bcAddr */, Collections.singletonList(SERVER_ADDR) /* gateways */,
+                Collections.singletonList(SERVER_ADDR) /* dnsServers */,
+                SERVER_ADDR /* dhcpServerIdentifier */, null /* domainName */, false /* metered */);
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        // BOOTP headers
+        bos.write(new byte[] {
+                (byte) 0x02, (byte) 0x01, (byte) 0x06, (byte) 0x00,
+                (byte) 0xde, (byte) 0xad, (byte) 0xbe, (byte) 0xef,
+                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+                // ciaddr
+                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+        });
+        // yiaddr
+        bos.write(CLIENT_ADDR.getAddress());
+        // siaddr
+        bos.write(SERVER_ADDR.getAddress());
+        // giaddr
+        bos.write(INADDR_ANY.getAddress());
+        // chaddr
+        bos.write(CLIENT_MAC);
+
+        // Padding
+        bos.write(new byte[202]);
+
+        // Options
+        bos.write(new byte[]{
+                // Magic cookie 0x63825363.
+                (byte) 0x63, (byte) 0x82, (byte) 0x53, (byte) 0x63,
+                // Message type OFFER.
+                (byte) 0x35, (byte) 0x01, (byte) 0x02,
+        });
+        // Server ID
+        bos.write(new byte[] { (byte) 0x36, (byte) 0x04 });
+        bos.write(SERVER_ADDR.getAddress());
+        // Lease time
+        bos.write(new byte[] { (byte) 0x33, (byte) 0x04 });
+        bos.write(intToByteArray(leaseTimeSecs));
+        if (leaseTimeSecs != INFINITE_LEASE) {
+            // Renewal time
+            bos.write(new byte[]{(byte) 0x3a, (byte) 0x04});
+            bos.write(intToByteArray(renewalTime));
+            // Rebinding time
+            bos.write(new byte[]{(byte) 0x3b, (byte) 0x04});
+            bos.write(intToByteArray(rebindingTime));
+        }
+        // Subnet mask
+        bos.write(new byte[] { (byte) 0x01, (byte) 0x04 });
+        bos.write(NETMASK.getAddress());
+        // Broadcast address
+        bos.write(new byte[] { (byte) 0x1c, (byte) 0x04 });
+        bos.write(BROADCAST_ADDR.getAddress());
+        // Router
+        bos.write(new byte[] { (byte) 0x03, (byte) 0x04 });
+        bos.write(SERVER_ADDR.getAddress());
+        // Nameserver
+        bos.write(new byte[] { (byte) 0x06, (byte) 0x04 });
+        bos.write(SERVER_ADDR.getAddress());
+        // End options.
+        bos.write(0xff);
+
+        final byte[] expected = bos.toByteArray();
+        assertTrue((expected.length & 1) == 0);
+
+        final byte[] actual = new byte[packet.limit()];
+        packet.get(actual);
+        final String msg = "Expected:\n  " + HexDump.dumpHexString(expected) +
+                "\nActual:\n  " + HexDump.dumpHexString(actual);
+        assertTrue(msg, Arrays.equals(expected, actual));
+    }
+
+    @Test
+    public void testOfferPacket() throws Exception {
+        checkBuildOfferPacket(3600);
+        checkBuildOfferPacket(Integer.MAX_VALUE);
+        checkBuildOfferPacket(0x80000000);
+        checkBuildOfferPacket(INFINITE_LEASE);
+    }
+
+    private static byte[] intToByteArray(int val) {
+        return ByteBuffer.allocate(4).putInt(val).array();
+    }
 }
diff --git a/tests/net/java/android/net/dhcp/DhcpServerTest.java b/tests/net/java/android/net/dhcp/DhcpServerTest.java
new file mode 100644
index 0000000..45a50d9
--- /dev/null
+++ b/tests/net/java/android/net/dhcp/DhcpServerTest.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.dhcp;
+
+import static android.net.dhcp.DhcpPacket.DHCP_CLIENT;
+import static android.net.dhcp.DhcpPacket.ENCAP_BOOTP;
+import static android.net.dhcp.DhcpPacket.INADDR_ANY;
+import static android.net.dhcp.DhcpPacket.INADDR_BROADCAST;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static java.net.InetAddress.parseNumericAddress;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.net.LinkAddress;
+import android.net.MacAddress;
+import android.net.dhcp.DhcpLeaseRepository.InvalidAddressException;
+import android.net.dhcp.DhcpLeaseRepository.OutOfAddressesException;
+import android.net.dhcp.DhcpServer.Clock;
+import android.net.dhcp.DhcpServer.Dependencies;
+import android.net.util.InterfaceParams;
+import android.net.util.SharedLog;
+import android.os.test.TestLooper;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.net.Inet4Address;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class DhcpServerTest {
+    private static final String PROP_DEXMAKER_SHARE_CLASSLOADER = "dexmaker.share_classloader";
+    private static final String TEST_IFACE = "testiface";
+    private static final MacAddress TEST_IFACE_MAC = MacAddress.fromString("11:22:33:44:55:66");
+    private static final InterfaceParams TEST_IFACEPARAMS =
+            new InterfaceParams(TEST_IFACE, 1, TEST_IFACE_MAC);
+
+    private static final Inet4Address TEST_SERVER_ADDR = parseAddr("192.168.0.2");
+    private static final LinkAddress TEST_SERVER_LINKADDR = new LinkAddress(TEST_SERVER_ADDR, 20);
+    private static final Set<Inet4Address> TEST_DEFAULT_ROUTERS = new HashSet<>(
+            Arrays.asList(parseAddr("192.168.0.123"), parseAddr("192.168.0.124")));
+    private static final Set<Inet4Address> TEST_DNS_SERVERS = new HashSet<>(
+            Arrays.asList(parseAddr("192.168.0.126"), parseAddr("192.168.0.127")));
+    private static final Set<Inet4Address> TEST_EXCLUDED_ADDRS = new HashSet<>(
+            Arrays.asList(parseAddr("192.168.0.200"), parseAddr("192.168.0.201")));
+    private static final long TEST_LEASE_TIME_SECS = 3600L;
+    private static final int TEST_MTU = 1500;
+
+    private static final int TEST_TRANSACTION_ID = 123;
+    private static final byte[] TEST_CLIENT_MAC_BYTES = new byte [] { 1, 2, 3, 4, 5, 6 };
+    private static final MacAddress TEST_CLIENT_MAC = MacAddress.fromBytes(TEST_CLIENT_MAC_BYTES);
+    private static final Inet4Address TEST_CLIENT_ADDR = parseAddr("192.168.0.42");
+
+    private static final long TEST_CLOCK_TIME = 1234L;
+    private static final int TEST_LEASE_EXPTIME_SECS = 3600;
+    private static final DhcpLease TEST_LEASE = new DhcpLease(null, TEST_CLIENT_MAC,
+            TEST_CLIENT_ADDR, TEST_LEASE_EXPTIME_SECS*1000L + TEST_CLOCK_TIME, null /* hostname */);
+
+    @NonNull @Mock
+    private Dependencies mDeps;
+    @NonNull @Mock
+    private DhcpLeaseRepository mRepository;
+    @NonNull @Mock
+    private Clock mClock;
+    @NonNull @Mock
+    private DhcpPacketListener mPacketListener;
+
+    @NonNull @Captor
+    private ArgumentCaptor<ByteBuffer> mSentPacketCaptor;
+    @NonNull @Captor
+    private ArgumentCaptor<Inet4Address> mResponseDstAddrCaptor;
+
+    @NonNull
+    private TestLooper mLooper;
+    @NonNull
+    private DhcpServer mServer;
+
+    @Nullable
+    private String mPrevShareClassloaderProp;
+
+    @Before
+    public void setUp() throws Exception {
+        // Allow mocking package-private classes
+        mPrevShareClassloaderProp = System.getProperty(PROP_DEXMAKER_SHARE_CLASSLOADER);
+        System.setProperty(PROP_DEXMAKER_SHARE_CLASSLOADER, "true");
+        MockitoAnnotations.initMocks(this);
+
+        when(mDeps.makeLeaseRepository(any(), any(), any())).thenReturn(mRepository);
+        when(mDeps.makeClock()).thenReturn(mClock);
+        when(mDeps.makePacketListener()).thenReturn(mPacketListener);
+        doNothing().when(mDeps)
+                .sendPacket(any(), mSentPacketCaptor.capture(), mResponseDstAddrCaptor.capture());
+        when(mClock.elapsedRealtime()).thenReturn(TEST_CLOCK_TIME);
+
+        final DhcpServingParams servingParams = new DhcpServingParams.Builder()
+                .setDefaultRouters(TEST_DEFAULT_ROUTERS)
+                .setDhcpLeaseTimeSecs(TEST_LEASE_TIME_SECS)
+                .setDnsServers(TEST_DNS_SERVERS)
+                .setServerAddr(TEST_SERVER_LINKADDR)
+                .setLinkMtu(TEST_MTU)
+                .setExcludedAddrs(TEST_EXCLUDED_ADDRS)
+                .build();
+
+        mLooper = new TestLooper();
+        mServer = new DhcpServer(mLooper.getLooper(), TEST_IFACEPARAMS, servingParams,
+                new SharedLog(DhcpServerTest.class.getSimpleName()), mDeps);
+
+        mServer.start();
+        mLooper.dispatchAll();
+    }
+
+    @After
+    public void tearDown() {
+        // Calling stop() several times is not an issue
+        mServer.stop();
+        System.setProperty(PROP_DEXMAKER_SHARE_CLASSLOADER,
+                (mPrevShareClassloaderProp == null ? "" : mPrevShareClassloaderProp));
+    }
+
+    @Test
+    public void testStart() throws Exception {
+        verify(mPacketListener, times(1)).start();
+    }
+
+    @Test
+    public void testStop() throws Exception {
+        mServer.stop();
+        mLooper.dispatchAll();
+        verify(mPacketListener, times(1)).stop();
+    }
+
+    @Test
+    public void testDiscover() throws Exception {
+        // TODO: refactor packet construction to eliminate unnecessary/confusing/duplicate fields
+        when(mRepository.getOffer(isNull() /* clientId */, eq(TEST_CLIENT_MAC),
+                eq(INADDR_ANY) /* relayAddr */, isNull() /* reqAddr */, isNull() /* hostname */))
+                .thenReturn(TEST_LEASE);
+
+        final DhcpDiscoverPacket discover = new DhcpDiscoverPacket(TEST_TRANSACTION_ID,
+                (short) 0 /* secs */, INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES,
+                false /* broadcast */, INADDR_ANY /* srcIp */);
+        mServer.processPacket(discover, DHCP_CLIENT);
+
+        assertResponseSentTo(TEST_CLIENT_ADDR);
+        final DhcpOfferPacket packet = assertOffer(getPacket());
+        assertMatchesTestLease(packet);
+    }
+
+    @Test
+    public void testDiscover_OutOfAddresses() throws Exception {
+        when(mRepository.getOffer(isNull() /* clientId */, eq(TEST_CLIENT_MAC),
+                eq(INADDR_ANY) /* relayAddr */, isNull() /* reqAddr */, isNull() /* hostname */))
+                .thenThrow(new OutOfAddressesException("Test exception"));
+
+        final DhcpDiscoverPacket discover = new DhcpDiscoverPacket(TEST_TRANSACTION_ID,
+                (short) 0 /* secs */, INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES,
+                false /* broadcast */, INADDR_ANY /* srcIp */);
+        mServer.processPacket(discover, DHCP_CLIENT);
+
+        assertResponseSentTo(INADDR_BROADCAST);
+        final DhcpNakPacket packet = assertNak(getPacket());
+        assertMatchesClient(packet);
+    }
+
+    private DhcpRequestPacket makeRequestSelectingPacket() {
+        final DhcpRequestPacket request = new DhcpRequestPacket(TEST_TRANSACTION_ID,
+                (short) 0 /* secs */, INADDR_ANY /* clientIp */, INADDR_ANY /* relayIp */,
+                TEST_CLIENT_MAC_BYTES, false /* broadcast */);
+        request.mServerIdentifier = TEST_SERVER_ADDR;
+        request.mRequestedIp = TEST_CLIENT_ADDR;
+        return request;
+    }
+
+    @Test
+    public void testRequest_Selecting_Ack() throws Exception {
+        when(mRepository.requestLease(isNull() /* clientId */, eq(TEST_CLIENT_MAC),
+                eq(INADDR_ANY) /* clientAddr */, eq(INADDR_ANY) /* relayAddr */,
+                eq(TEST_CLIENT_ADDR) /* reqAddr */, eq(true) /* sidSet */, isNull() /* hostname */))
+                .thenReturn(TEST_LEASE);
+
+        final DhcpRequestPacket request = makeRequestSelectingPacket();
+        mServer.processPacket(request, DHCP_CLIENT);
+
+        assertResponseSentTo(TEST_CLIENT_ADDR);
+        final DhcpAckPacket packet = assertAck(getPacket());
+        assertMatchesTestLease(packet);
+    }
+
+    @Test
+    public void testRequest_Selecting_Nak() throws Exception {
+        when(mRepository.requestLease(isNull(), eq(TEST_CLIENT_MAC),
+                eq(INADDR_ANY) /* clientAddr */, eq(INADDR_ANY) /* relayAddr */,
+                eq(TEST_CLIENT_ADDR) /* reqAddr */, eq(true) /* sidSet */, isNull() /* hostname */))
+                .thenThrow(new InvalidAddressException("Test error"));
+
+        final DhcpRequestPacket request = makeRequestSelectingPacket();
+        mServer.processPacket(request, DHCP_CLIENT);
+
+        assertResponseSentTo(INADDR_BROADCAST);
+        final DhcpNakPacket packet = assertNak(getPacket());
+        assertMatchesClient(packet);
+    }
+
+    @Test
+    public void testRequest_Selecting_WrongClientPort() throws Exception {
+        final DhcpRequestPacket request = makeRequestSelectingPacket();
+        mServer.processPacket(request, 50000);
+
+        verify(mRepository, never())
+                .requestLease(any(), any(), any(), any(), any(), anyBoolean(), any());
+        verify(mDeps, never()).sendPacket(any(), any(), any());
+    }
+
+    @Test
+    public void testRelease() throws Exception {
+        final DhcpReleasePacket release = new DhcpReleasePacket(TEST_TRANSACTION_ID,
+                TEST_SERVER_ADDR, TEST_CLIENT_ADDR,
+                INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES);
+        mServer.processPacket(release, DHCP_CLIENT);
+
+        verify(mRepository, times(1))
+                .releaseLease(isNull(), eq(TEST_CLIENT_MAC), eq(TEST_CLIENT_ADDR));
+    }
+
+    /* TODO: add more tests once packet construction is refactored, including:
+     *  - usage of giaddr
+     *  - usage of broadcast bit
+     *  - other request states (init-reboot/renewing/rebinding)
+     */
+
+    private void assertMatchesTestLease(@NonNull DhcpPacket packet) {
+        assertMatchesClient(packet);
+        assertFalse(packet.hasExplicitClientId());
+        assertEquals(TEST_SERVER_ADDR, packet.mServerIdentifier);
+        assertEquals(TEST_CLIENT_ADDR, packet.mYourIp);
+        assertNotNull(packet.mLeaseTime);
+        assertEquals(TEST_LEASE_EXPTIME_SECS, (int) packet.mLeaseTime);
+        assertNull(packet.mHostName);
+    }
+
+    private void assertMatchesClient(@NonNull DhcpPacket packet) {
+        assertEquals(TEST_TRANSACTION_ID, packet.mTransId);
+        assertEquals(TEST_CLIENT_MAC, MacAddress.fromBytes(packet.mClientMac));
+    }
+
+    private void assertResponseSentTo(@NonNull Inet4Address addr) {
+        assertEquals(addr, mResponseDstAddrCaptor.getValue());
+    }
+
+    private static DhcpNakPacket assertNak(@Nullable DhcpPacket packet) {
+        assertTrue(packet instanceof DhcpNakPacket);
+        return (DhcpNakPacket) packet;
+    }
+
+    private static DhcpAckPacket assertAck(@Nullable DhcpPacket packet) {
+        assertTrue(packet instanceof DhcpAckPacket);
+        return (DhcpAckPacket) packet;
+    }
+
+    private static DhcpOfferPacket assertOffer(@Nullable DhcpPacket packet) {
+        assertTrue(packet instanceof DhcpOfferPacket);
+        return (DhcpOfferPacket) packet;
+    }
+
+    private DhcpPacket getPacket() throws Exception {
+        verify(mDeps, times(1)).sendPacket(any(), any(), any());
+        return DhcpPacket.decodeFullPacket(mSentPacketCaptor.getValue(), ENCAP_BOOTP);
+    }
+
+    private static Inet4Address parseAddr(@Nullable String inet4Addr) {
+        return (Inet4Address) parseNumericAddress(inet4Addr);
+    }
+}
diff --git a/tests/net/java/android/net/dhcp/DhcpServingParamsTest.java b/tests/net/java/android/net/dhcp/DhcpServingParamsTest.java
index dfa09a9..b6a4073 100644
--- a/tests/net/java/android/net/dhcp/DhcpServingParamsTest.java
+++ b/tests/net/java/android/net/dhcp/DhcpServingParamsTest.java
@@ -37,7 +37,6 @@
 
 import java.net.Inet4Address;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -150,14 +149,14 @@
 
     @Test(expected = InvalidParameterException.class)
     public void testBuild_PrefixTooSmall() throws InvalidParameterException {
-        mBuilder.setDefaultRouters(Collections.singleton(parseAddr("192.168.0.254")))
+        mBuilder.setDefaultRouters(parseAddr("192.168.0.254"))
                 .setServerAddr(new LinkAddress(TEST_SERVER_ADDR, 31))
                 .build();
     }
 
     @Test(expected = InvalidParameterException.class)
     public void testBuild_RouterNotInPrefix() throws InvalidParameterException {
-        mBuilder.setDefaultRouters(Collections.singleton(parseAddr("192.168.254.254"))).build();
+        mBuilder.setDefaultRouters(parseAddr("192.168.254.254")).build();
     }
 
     private static <T> void assertContains(@NonNull Set<T> set, @NonNull Set<T> subset) {
diff --git a/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java b/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java
index b017130..b399b0d 100644
--- a/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java
@@ -106,6 +106,7 @@
                 anyString())).thenReturn(TEST_HTTP_URL);
         when(mDependencies.getSetting(any(), eq(Settings.Global.CAPTIVE_PORTAL_HTTPS_URL),
                 anyString())).thenReturn(TEST_HTTPS_URL);
+        when(mNetwork.getPrivateDnsBypassingCopy()).thenReturn(mNetwork);
 
         when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephony);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifi);
diff --git a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java
index f025f41..4dc63f2 100644
--- a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java
+++ b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java
@@ -21,7 +21,9 @@
 import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
 import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS;
 import static android.Manifest.permission.NETWORK_STACK;
-import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
+import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_OEM;
+import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_PRODUCT;
+import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_VENDOR;
 import static android.content.pm.PackageManager.GET_PERMISSIONS;
 
 import static org.junit.Assert.assertFalse;
@@ -34,6 +36,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -48,6 +51,10 @@
 public class PermissionMonitorTest {
     private static final int MOCK_UID = 10001;
     private static final String[] MOCK_PACKAGE_NAMES = new String[] { "com.foo.bar" };
+    private static final String PARTITION_SYSTEM = "system";
+    private static final String PARTITION_OEM = "oem";
+    private static final String PARTITION_PRODUCT = "product";
+    private static final String PARTITION_VENDOR = "vendor";
 
     @Mock private Context mContext;
     @Mock private PackageManager mPackageManager;
@@ -62,39 +69,53 @@
         mPermissionMonitor = new PermissionMonitor(mContext, null);
     }
 
-    private void expectPermission(String[] permissions, boolean preinstalled) throws Exception {
-        final PackageInfo packageInfo = packageInfoWithPermissions(permissions, preinstalled);
+    private void expectPermission(String[] permissions, String partition,
+            int targetSdkVersion) throws Exception {
+        final PackageInfo packageInfo = packageInfoWithPermissions(permissions, partition);
+        packageInfo.applicationInfo.targetSdkVersion = targetSdkVersion;
         when(mPackageManager.getPackageInfoAsUser(
                 eq(MOCK_PACKAGE_NAMES[0]), eq(GET_PERMISSIONS), anyInt())).thenReturn(packageInfo);
     }
 
-    private PackageInfo packageInfoWithPermissions(String[] permissions, boolean preinstalled) {
+    private PackageInfo packageInfoWithPermissions(String[] permissions, String partition) {
         final PackageInfo packageInfo = new PackageInfo();
         packageInfo.requestedPermissions = permissions;
         packageInfo.applicationInfo = new ApplicationInfo();
-        packageInfo.applicationInfo.flags = preinstalled ? FLAG_SYSTEM : 0;
+        int privateFlags = 0;
+        switch (partition) {
+            case PARTITION_OEM:
+                privateFlags = PRIVATE_FLAG_OEM;
+                break;
+            case PARTITION_PRODUCT:
+                privateFlags = PRIVATE_FLAG_PRODUCT;
+                break;
+            case PARTITION_VENDOR:
+                privateFlags = PRIVATE_FLAG_VENDOR;
+                break;
+        }
+        packageInfo.applicationInfo.privateFlags = privateFlags;
         return packageInfo;
     }
 
     @Test
     public void testHasPermission() {
-        PackageInfo app = packageInfoWithPermissions(new String[] {}, false);
+        PackageInfo app = packageInfoWithPermissions(new String[] {}, PARTITION_SYSTEM);
         assertFalse(mPermissionMonitor.hasPermission(app, CHANGE_NETWORK_STATE));
         assertFalse(mPermissionMonitor.hasPermission(app, NETWORK_STACK));
         assertFalse(mPermissionMonitor.hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS));
         assertFalse(mPermissionMonitor.hasPermission(app, CONNECTIVITY_INTERNAL));
 
         app = packageInfoWithPermissions(new String[] {
-                CHANGE_NETWORK_STATE, NETWORK_STACK
-            }, false);
+            CHANGE_NETWORK_STATE, NETWORK_STACK
+        }, PARTITION_SYSTEM);
         assertTrue(mPermissionMonitor.hasPermission(app, CHANGE_NETWORK_STATE));
         assertTrue(mPermissionMonitor.hasPermission(app, NETWORK_STACK));
         assertFalse(mPermissionMonitor.hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS));
         assertFalse(mPermissionMonitor.hasPermission(app, CONNECTIVITY_INTERNAL));
 
         app = packageInfoWithPermissions(new String[] {
-                CONNECTIVITY_USE_RESTRICTED_NETWORKS, CONNECTIVITY_INTERNAL
-            }, false);
+            CONNECTIVITY_USE_RESTRICTED_NETWORKS, CONNECTIVITY_INTERNAL
+        }, PARTITION_SYSTEM);
         assertFalse(mPermissionMonitor.hasPermission(app, CHANGE_NETWORK_STATE));
         assertFalse(mPermissionMonitor.hasPermission(app, NETWORK_STACK));
         assertTrue(mPermissionMonitor.hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS));
@@ -102,35 +123,64 @@
     }
 
     @Test
-    public void testIsPreinstalledSystemApp() {
-        PackageInfo app = packageInfoWithPermissions(new String[] {}, false);
-        assertFalse(mPermissionMonitor.isPreinstalledSystemApp(app));
-
-        app = packageInfoWithPermissions(new String[] {}, true);
-        assertTrue(mPermissionMonitor.isPreinstalledSystemApp(app));
+    public void testIsVendorApp() {
+        PackageInfo app = packageInfoWithPermissions(new String[] {}, PARTITION_SYSTEM);
+        assertFalse(mPermissionMonitor.isVendorApp(app.applicationInfo));
+        app = packageInfoWithPermissions(new String[] {}, PARTITION_OEM);
+        assertTrue(mPermissionMonitor.isVendorApp(app.applicationInfo));
+        app = packageInfoWithPermissions(new String[] {}, PARTITION_PRODUCT);
+        assertTrue(mPermissionMonitor.isVendorApp(app.applicationInfo));
+        app = packageInfoWithPermissions(new String[] {}, PARTITION_VENDOR);
+        assertTrue(mPermissionMonitor.isVendorApp(app.applicationInfo));
     }
 
     @Test
     public void testHasUseBackgroundNetworksPermission() throws Exception {
-        expectPermission(new String[] { CHANGE_NETWORK_STATE }, false);
+        expectPermission(new String[] { CHANGE_NETWORK_STATE },
+            PARTITION_SYSTEM, Build.VERSION_CODES.P);
+        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { NETWORK_STACK }, PARTITION_SYSTEM, Build.VERSION_CODES.P);
+        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { CONNECTIVITY_INTERNAL },
+            PARTITION_SYSTEM, Build.VERSION_CODES.P);
+        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { CONNECTIVITY_USE_RESTRICTED_NETWORKS },
+            PARTITION_SYSTEM, Build.VERSION_CODES.P);
         assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
 
-        expectPermission(new String[] { NETWORK_STACK, CONNECTIVITY_INTERNAL }, false);
+        expectPermission(new String[] { CHANGE_NETWORK_STATE },
+            PARTITION_VENDOR, Build.VERSION_CODES.P);
+        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { NETWORK_STACK },
+            PARTITION_VENDOR, Build.VERSION_CODES.P);
+        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { CONNECTIVITY_INTERNAL },
+            PARTITION_VENDOR, Build.VERSION_CODES.P);
+        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { CONNECTIVITY_USE_RESTRICTED_NETWORKS },
+            PARTITION_VENDOR, Build.VERSION_CODES.P);
         assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
 
-        // TODO : make this false when b/31479477 is fixed
-        expectPermission(new String[] {}, true);
-        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
-        expectPermission(new String[] { CHANGE_WIFI_STATE }, true);
-        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
-
-        expectPermission(new String[] { NETWORK_STACK, CONNECTIVITY_INTERNAL }, true);
-        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
-
-        expectPermission(new String[] {}, false);
+        expectPermission(new String[] {}, PARTITION_SYSTEM, Build.VERSION_CODES.P);
         assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { CHANGE_WIFI_STATE },
+            PARTITION_SYSTEM, Build.VERSION_CODES.P);
+        assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] {}, PARTITION_VENDOR, Build.VERSION_CODES.P);
+        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { CHANGE_WIFI_STATE },
+            PARTITION_VENDOR, Build.VERSION_CODES.P);
+        assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
 
-        expectPermission(new String[] { CHANGE_WIFI_STATE }, false);
+        expectPermission(new String[] {}, PARTITION_SYSTEM, Build.VERSION_CODES.Q);
+        assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { CHANGE_WIFI_STATE },
+            PARTITION_SYSTEM, Build.VERSION_CODES.Q);
+        assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] {}, PARTITION_VENDOR, Build.VERSION_CODES.Q);
+        assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
+        expectPermission(new String[] { CHANGE_WIFI_STATE },
+            PARTITION_VENDOR, Build.VERSION_CODES.Q);
         assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID));
     }
 }
diff --git a/tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java b/tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java
index 19d3a2e..5934653 100644
--- a/tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java
+++ b/tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java
@@ -16,6 +16,7 @@
 
 package com.android.server.connectivity.tethering;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
@@ -23,7 +24,9 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -40,9 +43,15 @@
 
 import android.net.INetworkStatsService;
 import android.net.InterfaceConfiguration;
+import android.net.IpPrefix;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
+import android.net.MacAddress;
 import android.net.RouteInfo;
+import android.net.dhcp.DhcpServer;
+import android.net.dhcp.DhcpServingParams;
+import android.net.ip.RouterAdvertisementDaemon;
+import android.net.util.InterfaceParams;
 import android.net.util.InterfaceSet;
 import android.net.util.SharedLog;
 import android.os.INetworkManagementService;
@@ -58,6 +67,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -68,33 +78,58 @@
     private static final String IFACE_NAME = "testnet1";
     private static final String UPSTREAM_IFACE = "upstream0";
     private static final String UPSTREAM_IFACE2 = "upstream1";
+    private static final int DHCP_LEASE_TIME_SECS = 3600;
+
+    private static final InterfaceParams TEST_IFACE_PARAMS = new InterfaceParams(
+            IFACE_NAME, 42 /* index */, MacAddress.ALL_ZEROS_ADDRESS, 1500 /* defaultMtu */);
 
     @Mock private INetworkManagementService mNMService;
     @Mock private INetworkStatsService mStatsService;
     @Mock private IControlsTethering mTetherHelper;
     @Mock private InterfaceConfiguration mInterfaceConfiguration;
     @Mock private SharedLog mSharedLog;
+    @Mock private DhcpServer mDhcpServer;
+    @Mock private RouterAdvertisementDaemon mRaDaemon;
     @Mock private TetheringDependencies mTetheringDependencies;
 
+    @Captor private ArgumentCaptor<DhcpServingParams> mDhcpParamsCaptor;
+
     private final TestLooper mLooper = new TestLooper();
     private final ArgumentCaptor<LinkProperties> mLinkPropertiesCaptor =
             ArgumentCaptor.forClass(LinkProperties.class);
     private TetherInterfaceStateMachine mTestedSm;
 
     private void initStateMachine(int interfaceType) throws Exception {
+        initStateMachine(interfaceType, false /* usingLegacyDhcp */);
+    }
+
+    private void initStateMachine(int interfaceType, boolean usingLegacyDhcp) throws Exception {
         mTestedSm = new TetherInterfaceStateMachine(
                 IFACE_NAME, mLooper.getLooper(), interfaceType, mSharedLog,
-                mNMService, mStatsService, mTetherHelper, mTetheringDependencies);
+                mNMService, mStatsService, mTetherHelper, usingLegacyDhcp,
+                mTetheringDependencies);
         mTestedSm.start();
         // Starting the state machine always puts us in a consistent state and notifies
         // the rest of the world that we've changed from an unknown to available state.
         mLooper.dispatchAll();
         reset(mNMService, mStatsService, mTetherHelper);
         when(mNMService.getInterfaceConfig(IFACE_NAME)).thenReturn(mInterfaceConfiguration);
+        when(mTetheringDependencies.makeDhcpServer(
+                any(), any(), mDhcpParamsCaptor.capture(), any())).thenReturn(mDhcpServer);
+        when(mTetheringDependencies.getRouterAdvertisementDaemon(any())).thenReturn(mRaDaemon);
+        when(mTetheringDependencies.getInterfaceParams(IFACE_NAME)).thenReturn(TEST_IFACE_PARAMS);
+
+        when(mRaDaemon.start()).thenReturn(true);
     }
 
-    private void initTetheredStateMachine(int interfaceType, String upstreamIface) throws Exception {
-        initStateMachine(interfaceType);
+    private void initTetheredStateMachine(int interfaceType, String upstreamIface)
+            throws Exception {
+        initTetheredStateMachine(interfaceType, upstreamIface, false);
+    }
+
+    private void initTetheredStateMachine(int interfaceType, String upstreamIface,
+            boolean usingLegacyDhcp) throws Exception {
+        initStateMachine(interfaceType, usingLegacyDhcp);
         dispatchCommand(TetherInterfaceStateMachine.CMD_TETHER_REQUESTED, STATE_TETHERED);
         if (upstreamIface != null) {
             dispatchTetherConnectionChanged(upstreamIface);
@@ -112,7 +147,7 @@
     public void startsOutAvailable() {
         mTestedSm = new TetherInterfaceStateMachine(IFACE_NAME, mLooper.getLooper(),
                 TETHERING_BLUETOOTH, mSharedLog, mNMService, mStatsService, mTetherHelper,
-                mTetheringDependencies);
+                false /* usingLegacyDhcp */, mTetheringDependencies);
         mTestedSm.start();
         mLooper.dispatchAll();
         verify(mTetherHelper).updateInterfaceState(
@@ -345,6 +380,45 @@
         }
     }
 
+    @Test
+    public void startsDhcpServer() throws Exception {
+        initTetheredStateMachine(TETHERING_WIFI, UPSTREAM_IFACE);
+        dispatchTetherConnectionChanged(UPSTREAM_IFACE);
+
+        assertDhcpStarted(new IpPrefix("192.168.43.0/24"));
+    }
+
+    @Test
+    public void startsDhcpServerOnBluetooth() throws Exception {
+        initTetheredStateMachine(TETHERING_BLUETOOTH, UPSTREAM_IFACE);
+        dispatchTetherConnectionChanged(UPSTREAM_IFACE);
+
+        assertDhcpStarted(new IpPrefix("192.168.44.0/24"));
+    }
+
+    @Test
+    public void doesNotStartDhcpServerIfDisabled() throws Exception {
+        initTetheredStateMachine(TETHERING_WIFI, UPSTREAM_IFACE, true /* usingLegacyDhcp */);
+        dispatchTetherConnectionChanged(UPSTREAM_IFACE);
+
+        verify(mTetheringDependencies, never()).makeDhcpServer(any(), any(), any(), any());
+    }
+
+    private void assertDhcpStarted(IpPrefix expectedPrefix) {
+        verify(mTetheringDependencies, times(1)).makeDhcpServer(
+                eq(mLooper.getLooper()), eq(TEST_IFACE_PARAMS), any(), eq(mSharedLog));
+        verify(mDhcpServer, times(1)).start();
+        final DhcpServingParams params = mDhcpParamsCaptor.getValue();
+        // Last address byte is random
+        assertTrue(expectedPrefix.contains(params.serverAddr.getAddress()));
+        assertEquals(expectedPrefix.getPrefixLength(), params.serverAddr.getPrefixLength());
+        assertEquals(1, params.defaultRouters.size());
+        assertEquals(params.serverAddr.getAddress(), params.defaultRouters.iterator().next());
+        assertEquals(1, params.dnsServers.size());
+        assertEquals(params.serverAddr.getAddress(), params.dnsServers.iterator().next());
+        assertEquals(DHCP_LEASE_TIME_SECS, params.dhcpLeaseTimeSecs);
+    }
+
     /**
      * Send a command to the state machine under test, and run the event loop to idle.
      *
diff --git a/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java b/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java
index b68f203..bb31230 100644
--- a/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java
+++ b/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java
@@ -21,6 +21,8 @@
 import static android.net.ConnectivityManager.TYPE_MOBILE_DUN;
 import static android.net.ConnectivityManager.TYPE_MOBILE_HIPRI;
 import static android.net.ConnectivityManager.TYPE_WIFI;
+import static android.provider.Settings.Global.TETHER_ENABLE_LEGACY_DHCP_SERVER;
+
 import static com.android.server.connectivity.tethering.TetheringConfiguration.DUN_NOT_REQUIRED;
 import static com.android.server.connectivity.tethering.TetheringConfiguration.DUN_REQUIRED;
 import static com.android.server.connectivity.tethering.TetheringConfiguration.DUN_UNSPECIFIED;
@@ -29,15 +31,18 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 
+import android.content.ContentResolver;
 import android.content.Context;
-import android.content.ContextWrapper;
 import android.content.res.Resources;
 import android.net.util.SharedLog;
+import android.provider.Settings;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.telephony.TelephonyManager;
+import android.test.mock.MockContentResolver;
 
 import com.android.internal.util.test.BroadcastInterceptingContext;
+import com.android.internal.util.test.FakeSettingsProvider;
 
 import java.util.Iterator;
 
@@ -55,6 +60,7 @@
     @Mock private Context mContext;
     @Mock private TelephonyManager mTelephonyManager;
     @Mock private Resources mResources;
+    private MockContentResolver mContentResolver;
     private Context mMockContext;
     private boolean mHasTelephonyManager;
 
@@ -73,6 +79,11 @@
             }
             return super.getSystemService(name);
         }
+
+        @Override
+        public ContentResolver getContentResolver() {
+            return mContentResolver;
+        }
     }
 
     @Before
@@ -86,6 +97,10 @@
                 .thenReturn(new String[]{ "test_wlan\\d" });
         when(mResources.getStringArray(com.android.internal.R.array.config_tether_bluetooth_regexs))
                 .thenReturn(new String[0]);
+        when(mResources.getIntArray(com.android.internal.R.array.config_tether_upstream_types))
+                .thenReturn(new int[0]);
+        mContentResolver = new MockContentResolver();
+        mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());
         mMockContext = new MockContext(mContext);
     }
 
@@ -194,4 +209,29 @@
         assertEquals(TYPE_MOBILE_HIPRI, upstreamIterator.next().intValue());
         assertFalse(upstreamIterator.hasNext());
     }
+
+    @Test
+    public void testNewDhcpServerDisabled() {
+        Settings.Global.putInt(mContentResolver, TETHER_ENABLE_LEGACY_DHCP_SERVER, 1);
+
+        final TetheringConfiguration cfg = new TetheringConfiguration(mMockContext, mLog);
+        assertTrue(cfg.enableLegacyDhcpServer);
+    }
+
+    @Test
+    public void testNewDhcpServerEnabled() {
+        Settings.Global.putInt(mContentResolver, TETHER_ENABLE_LEGACY_DHCP_SERVER, 0);
+
+        final TetheringConfiguration cfg = new TetheringConfiguration(mMockContext, mLog);
+        assertFalse(cfg.enableLegacyDhcpServer);
+    }
+
+    @Test
+    public void testNewDhcpServerDefault() {
+        Settings.Global.putString(mContentResolver, TETHER_ENABLE_LEGACY_DHCP_SERVER, null);
+
+        final TetheringConfiguration cfg = new TetheringConfiguration(mMockContext, mLog);
+        // TODO: change to false when new server is promoted to default
+        assertTrue(cfg.enableLegacyDhcpServer);
+    }
 }
diff --git a/tools/aapt/Android.bp b/tools/aapt/Android.bp
index e26c9c3..a594e5b 100644
--- a/tools/aapt/Android.bp
+++ b/tools/aapt/Android.bp
@@ -99,6 +99,17 @@
 }
 
 // ==========================================================
+// Build the host executable: aapt
+// ==========================================================
+cc_binary_host {
+    name: "aapt",
+    defaults: ["aapt_defaults"],
+    srcs: ["Main.cpp"],
+    use_version_lib: true,
+    static_libs: ["libaapt"],
+}
+
+// ==========================================================
 // Build the host tests: libaapt_tests
 // ==========================================================
 cc_test_host {
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
deleted file mode 100644
index 7bcf631..0000000
--- a/tools/aapt/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2014 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
-
-# ==========================================================
-# Setup some common variables for the different build
-# targets here.
-# ==========================================================
-LOCAL_PATH:= $(call my-dir)
-
-aaptHostStaticLibs := \
-    libandroidfw \
-    libpng \
-    libutils \
-    liblog \
-    libcutils \
-    libexpat \
-    libziparchive \
-    libbase \
-    libz
-
-aaptCFlags := -Wall -Werror
-
-# ==========================================================
-# Build the host executable: aapt
-# ==========================================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := aapt
-LOCAL_MODULE_HOST_OS := darwin linux windows
-LOCAL_CFLAGS := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\" $(aaptCFlags)
-LOCAL_SRC_FILES := Main.cpp
-LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs)
-
-include $(BUILD_HOST_EXECUTABLE)
-
-endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp
index d714687..2f2ef92 100644
--- a/tools/aapt/Main.cpp
+++ b/tools/aapt/Main.cpp
@@ -6,6 +6,7 @@
 #include "Main.h"
 #include "Bundle.h"
 
+#include <build/version.h>
 #include <utils/Compat.h>
 #include <utils/Log.h>
 #include <utils/threads.h>
@@ -20,10 +21,6 @@
 
 static const char* gProgName = "aapt";
 
-#ifndef AAPT_VERSION
-    #define AAPT_VERSION ""
-#endif
-
 /*
  * Show version info.  All the cool kids do it.
  */
@@ -32,7 +29,7 @@
     if (bundle->getFileSpecCount() != 0) {
         printf("(ignoring extra arguments)\n");
     }
-    printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");
+    printf("Android Asset Packaging Tool, v0.2-%s\n", android::build::GetBuildNumber().c_str());
 
     return 0;
 }
diff --git a/tools/aapt2/ResourceTable.cpp b/tools/aapt2/ResourceTable.cpp
index 58b5e8f..23322ab 100644
--- a/tools/aapt2/ResourceTable.cpp
+++ b/tools/aapt2/ResourceTable.cpp
@@ -51,7 +51,7 @@
 
 template <typename T>
 static bool less_than_struct_with_name_and_id(const std::unique_ptr<T>& lhs,
-                                              const std::pair<StringPiece, Maybe<uint8_t>>& rhs) {
+                                              const std::pair<StringPiece, Maybe<uint16_t>>& rhs) {
   int name_cmp = lhs->name.compare(0, lhs->name.size(), rhs.first.data(), rhs.first.size());
   return name_cmp < 0 || (name_cmp == 0 && rhs.second && lhs->id < rhs.second);
 }
@@ -141,7 +141,7 @@
   return types.emplace(iter, std::move(new_type))->get();
 }
 
-ResourceEntry* ResourceTableType::FindEntry(const StringPiece& name, const Maybe<uint8_t> id) {
+ResourceEntry* ResourceTableType::FindEntry(const StringPiece& name, const Maybe<uint16_t> id) {
   const auto last = entries.end();
   auto iter = std::lower_bound(entries.begin(), last, std::make_pair(name, id),
       less_than_struct_with_name_and_id<ResourceEntry>);
@@ -152,7 +152,7 @@
 }
 
 ResourceEntry* ResourceTableType::FindOrCreateEntry(const StringPiece& name,
-                                                    const Maybe<uint8_t> id) {
+                                                    const Maybe<uint16_t > id) {
   auto last = entries.end();
   auto iter = std::lower_bound(entries.begin(), last, std::make_pair(name, id),
                                less_than_struct_with_name_and_id<ResourceEntry>);
@@ -450,7 +450,7 @@
   }
 
   ResourceEntry* entry = type->FindOrCreateEntry(name.entry, use_id ? res_id.entry_id()
-                                                                    : Maybe<uint8_t>());
+                                                                    : Maybe<uint16_t>());
 
   // Check for entries appearing twice with two different entry ids
   if (check_id && entry->id && entry->id.value() != res_id.entry_id()) {
@@ -561,7 +561,7 @@
   }
 
   ResourceEntry* entry = type->FindOrCreateEntry(name.entry, use_id ? res_id.entry_id()
-                                                                    : Maybe<uint8_t>());
+                                                                    : Maybe<uint16_t>());
 
   // Check for entries appearing twice with two different entry ids
   if (check_id && entry->id && entry->id.value() != res_id.entry_id()) {
diff --git a/tools/aapt2/ResourceTable.h b/tools/aapt2/ResourceTable.h
index c40323c..5a43a2d 100644
--- a/tools/aapt2/ResourceTable.h
+++ b/tools/aapt2/ResourceTable.h
@@ -146,9 +146,10 @@
 
   explicit ResourceTableType(const ResourceType type) : type(type) {}
 
-  ResourceEntry* FindEntry(const android::StringPiece& name, Maybe<uint8_t> id = Maybe<uint8_t>());
+  ResourceEntry* FindEntry(const android::StringPiece& name,
+                           Maybe<uint16_t> id = Maybe<uint16_t>());
   ResourceEntry* FindOrCreateEntry(const android::StringPiece& name,
-                                   Maybe<uint8_t> id = Maybe<uint8_t>());
+                                   Maybe<uint16_t> id = Maybe<uint16_t>());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResourceTableType);
diff --git a/tools/aapt2/ResourceTable_test.cpp b/tools/aapt2/ResourceTable_test.cpp
index 7fa8ea2..1aa9751 100644
--- a/tools/aapt2/ResourceTable_test.cpp
+++ b/tools/aapt2/ResourceTable_test.cpp
@@ -258,4 +258,44 @@
   ASSERT_FALSE(table.SetOverlayable(name, overlayable, test::GetDiagnostics()));
 }
 
+TEST(ResourceTableTest, AllowDuplictaeResourcesNames) {
+  ResourceTable table(/* validate_resources */ false);
+
+  const ResourceName foo_name = test::ParseNameOrDie("android:bool/foo");
+  ASSERT_TRUE(table.AddResourceWithId(foo_name, ResourceId(0x7f0100ff), ConfigDescription{} , "",
+                                      test::BuildPrimitive(android::Res_value::TYPE_INT_BOOLEAN, 0),
+                                      test::GetDiagnostics()));
+  ASSERT_TRUE(table.AddResourceWithId(foo_name, ResourceId(0x7f010100), ConfigDescription{} , "",
+                                      test::BuildPrimitive(android::Res_value::TYPE_INT_BOOLEAN, 1),
+                                      test::GetDiagnostics()));
+
+  ASSERT_TRUE(table.SetVisibilityWithId(foo_name, Visibility{Visibility::Level::kPublic},
+                                        ResourceId(0x7f0100ff), test::GetDiagnostics()));
+  ASSERT_TRUE(table.SetVisibilityWithId(foo_name, Visibility{Visibility::Level::kPrivate},
+                                        ResourceId(0x7f010100), test::GetDiagnostics()));
+
+  auto package = table.FindPackageById(0x7f);
+  ASSERT_THAT(package, NotNull());
+  auto type = package->FindType(ResourceType::kBool);
+  ASSERT_THAT(type, NotNull());
+
+  auto entry1 = type->FindEntry("foo", 0x00ff);
+  ASSERT_THAT(entry1, NotNull());
+  ASSERT_THAT(entry1->id, Eq(0x00ff));
+  ASSERT_THAT(entry1->values[0], NotNull());
+  ASSERT_THAT(entry1->values[0]->value, NotNull());
+  ASSERT_THAT(ValueCast<BinaryPrimitive>(entry1->values[0]->value.get()), NotNull());
+  ASSERT_THAT(ValueCast<BinaryPrimitive>(entry1->values[0]->value.get())->value.data, Eq(0u));
+  ASSERT_THAT(entry1->visibility.level, Visibility::Level::kPublic);
+
+  auto entry2 = type->FindEntry("foo", 0x0100);
+  ASSERT_THAT(entry2, NotNull());
+  ASSERT_THAT(entry2->id, Eq(0x0100));
+  ASSERT_THAT(entry2->values[0], NotNull());
+  ASSERT_THAT(entry1->values[0]->value, NotNull());
+  ASSERT_THAT(ValueCast<BinaryPrimitive>(entry2->values[0]->value.get()), NotNull());
+  ASSERT_THAT(ValueCast<BinaryPrimitive>(entry2->values[0]->value.get())->value.data, Eq(1u));
+  ASSERT_THAT(entry2->visibility.level, Visibility::Level::kPrivate);
+}
+
 }  // namespace aapt
diff --git a/tools/aapt2/cmd/Dump.cpp b/tools/aapt2/cmd/Dump.cpp
index 29e471e..5cb30b6 100644
--- a/tools/aapt2/cmd/Dump.cpp
+++ b/tools/aapt2/cmd/Dump.cpp
@@ -298,7 +298,7 @@
       return 1;
     }
 
-    if (loaded_apk->GetApkFormat()) {
+    if (loaded_apk->GetApkFormat() == ApkFormat::kProto) {
       printer.Println("Proto APK");
     } else {
       printer.Println("Binary APK");
@@ -356,7 +356,7 @@
   for (auto xml_file : files_) {
     android::ResXMLTree tree;
 
-    if (loaded_apk->GetApkFormat() == kProto) {
+    if (loaded_apk->GetApkFormat() == ApkFormat::kProto) {
       auto xml = loaded_apk->LoadXml(xml_file, diag_);
       if (!xml) {
         return 1;
@@ -375,7 +375,7 @@
       std::string data = buffer.to_string();
       tree.setTo(data.data(), data.size(), /** copyData */ true);
 
-    } else if (loaded_apk->GetApkFormat() == kBinary) {
+    } else if (loaded_apk->GetApkFormat() == ApkFormat::kBinary) {
       io::IFile* file = loaded_apk->GetFileCollection()->FindFile(xml_file);
       if (!file) {
         diag_->Error(DiagMessage(xml_file) << "file '" << xml_file << "' not found in APK");
diff --git a/tools/hiddenapi/generate_hiddenapi_lists.py b/tools/hiddenapi/generate_hiddenapi_lists.py
new file mode 100755
index 0000000..4a0931a
--- /dev/null
+++ b/tools/hiddenapi/generate_hiddenapi_lists.py
@@ -0,0 +1,241 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+Generate API lists for non-SDK API enforcement.
+
+usage: generate-hiddenapi-lists.py [-h]
+                                   --input-public INPUT_PUBLIC
+                                   --input-private INPUT_PRIVATE
+                                   [--input-whitelists [INPUT_WHITELISTS [INPUT_WHITELISTS ...]]]
+                                   [--input-greylists [INPUT_GREYLISTS [INPUT_GREYLISTS ...]]]
+                                   [--input-blacklists [INPUT_BLACKLISTS [INPUT_BLACKLISTS ...]]]
+                                   --output-whitelist OUTPUT_WHITELIST
+                                   --output-light-greylist OUTPUT_LIGHT_GREYLIST
+                                   --output-dark-greylist OUTPUT_DARK_GREYLIST
+                                   --output-blacklist OUTPUT_BLACKLIST
+"""
+import argparse
+import os
+import sys
+import re
+
+def get_args():
+    """Parses command line arguments.
+
+    Returns:
+        Namespace: dictionary of parsed arguments
+    """
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--input-public', required=True, help='List of all public members')
+    parser.add_argument('--input-private', required=True, help='List of all private members')
+    parser.add_argument(
+        '--input-whitelists', nargs='*',
+        help='Lists of members to force on whitelist')
+    parser.add_argument(
+        '--input-greylists', nargs='*',
+        help='Lists of members to force on light greylist')
+    parser.add_argument(
+        '--input-blacklists', nargs='*',
+        help='Lists of members to force on blacklist')
+    parser.add_argument('--output-whitelist', required=True)
+    parser.add_argument('--output-light-greylist', required=True)
+    parser.add_argument('--output-dark-greylist', required=True)
+    parser.add_argument('--output-blacklist', required=True)
+    return parser.parse_args()
+
+def read_lines(filename):
+    """Reads entire file and return it as a list of lines.
+
+    Args:
+        filename (string): Path to the file to read from.
+
+    Returns:
+        list: Lines of the loaded file as a list of strings.
+    """
+    with open(filename, 'r') as f:
+        return f.readlines()
+
+def write_lines(filename, lines):
+    """Writes list of lines into a file, overwriting the file it it exists.
+
+    Args:
+        filename (string): Path to the file to be writting into.
+        lines (list): List of strings to write into the file.
+    """
+    with open(filename, 'w') as f:
+        f.writelines(lines)
+
+def move_between_sets(subset, src, dst, source = "<unknown>"):
+    """Removes a subset of elements from one set and add it to another.
+
+    Args:
+        subset (set): The subset of `src` to be moved from `src` to `dst`.
+        src (set): Source set. Must be a superset of `subset`.
+        dst (set): Destination set. Must be disjoint with `subset`.
+    """
+    assert src.issuperset(subset), (
+        "Error processing: {}\n"
+        "The following entries were not found:\n"
+        "{}"
+        "Please visit go/hiddenapi for more information.").format(
+            source, "".join(map(lambda x: "  " + str(x), subset.difference(src))))
+    assert dst.isdisjoint(subset)
+    # Order matters if `src` and `subset` are the same object.
+    dst.update(subset)
+    src.difference_update(subset)
+
+def get_package_name(signature):
+    """Returns the package name prefix of a class member signature.
+
+    Example: "Ljava/lang/String;->hashCode()J" --> "Ljava/lang/"
+
+    Args:
+        signature (string): Member signature
+
+    Returns
+        string: Package name of the given member
+    """
+    class_name_end = signature.find("->")
+    assert class_name_end != -1, "Invalid signature: {}".format(signature)
+    package_name_end = signature.rfind("/", 0, class_name_end)
+    assert package_name_end != -1, "Invalid signature: {}".format(signature)
+    return signature[:package_name_end + 1]
+
+def all_package_names(*args):
+    """Returns a set of packages names in given lists of member signatures.
+
+    Example: args = [ set([ "Lpkg1/ClassA;->foo()V", "Lpkg2/ClassB;->bar()J" ]),
+                      set([ "Lpkg1/ClassC;->baz()Z" ]) ]
+             return value = set([ "Lpkg1/", "Lpkg2" ])
+
+    Args:
+        *args (list): List of sets to iterate over and extract the package names
+                      of its elements (member signatures)
+
+    Returns:
+        set: All package names extracted from the given lists of signatures.
+    """
+    packages = set()
+    for arg in args:
+        packages = packages.union(map(get_package_name, arg))
+    return packages
+
+def move_all(src, dst):
+    """Moves all elements of one set to another.
+
+    Args:
+        src (set): Source set. Will become empty.
+        dst (set): Destination set. Will contain all elements of `src`.
+    """
+    move_between_sets(src, src, dst)
+
+def move_from_files(filenames, src, dst):
+    """Loads member signatures from a list of files and moves them to a given set.
+
+    Opens files in `filenames`, reads all their lines and moves those from `src`
+    set to `dst` set.
+
+    Args:
+        filenames (list): List of paths to files to be loaded.
+        src (set): Set that loaded lines should be moved from.
+        dst (set): Set that loaded lines should be moved to.
+    """
+    if filenames:
+        for filename in filenames:
+            move_between_sets(set(read_lines(filename)), src, dst, filename)
+
+def move_serialization(src, dst):
+    """Moves all members matching serialization API signatures between given sets.
+
+    Args:
+        src (set): Set that will be searched for serialization API and that API
+                   will be removed from it.
+        dst (set): Set that serialization API will be moved to.
+    """
+    serialization_patterns = [
+        r'readObject\(Ljava/io/ObjectInputStream;\)V',
+        r'readObjectNoData\(\)V',
+        r'readResolve\(\)Ljava/lang/Object;',
+        r'serialVersionUID:J',
+        r'serialPersistentFields:\[Ljava/io/ObjectStreamField;',
+        r'writeObject\(Ljava/io/ObjectOutputStream;\)V',
+        r'writeReplace\(\)Ljava/lang/Object;',
+    ]
+    regex = re.compile(r'.*->(' + '|'.join(serialization_patterns) + r')$')
+    move_between_sets(filter(lambda api: regex.match(api), src), src, dst)
+
+def move_from_packages(packages, src, dst):
+    """Moves all members of given package names from one set to another.
+
+    Args:
+        packages (list): List of string package names.
+        src (set): Set that will be searched for API matching one of the given
+                   package names. Surch API will be removed from the set.
+        dst (set): Set that matching API will be moved to.
+    """
+    move_between_sets(filter(lambda api: get_package_name(api) in packages, src), src, dst)
+
+def main(argv):
+    args = get_args()
+
+    # Initialize API sets by loading lists of public and private API. Public API
+    # are all members resolvable from SDK API stubs, other members are private.
+    # As an optimization, skip the step of moving public API from a full set of
+    # members and start with a populated whitelist.
+    whitelist = set(read_lines(args.input_public))
+    uncategorized = set(read_lines(args.input_private))
+    light_greylist = set()
+    dark_greylist = set()
+    blacklist = set()
+
+    # Assert that there is no overlap between public and private API.
+    assert whitelist.isdisjoint(uncategorized)
+    num_all_api = len(whitelist) + len(uncategorized)
+
+    # Read all files which manually assign members to specific lists.
+    move_from_files(args.input_whitelists, uncategorized, whitelist)
+    move_from_files(args.input_greylists, uncategorized, light_greylist)
+    move_from_files(args.input_blacklists, uncategorized, blacklist)
+
+    # Iterate over all uncategorized members and move serialization API to light greylist.
+    move_serialization(uncategorized, light_greylist)
+
+    # Extract package names of members from whitelist and light greylist, which
+    # are assumed to have been finalized at this point. Assign all uncategorized
+    # members from the same packages to the dark greylist.
+    dark_greylist_packages = all_package_names(whitelist, light_greylist)
+    move_from_packages(dark_greylist_packages, uncategorized, dark_greylist)
+
+    # Assign all uncategorized members to the blacklist.
+    move_all(uncategorized, blacklist)
+
+    # Assert we have not missed anything.
+    assert whitelist.isdisjoint(light_greylist)
+    assert whitelist.isdisjoint(dark_greylist)
+    assert whitelist.isdisjoint(blacklist)
+    assert light_greylist.isdisjoint(dark_greylist)
+    assert light_greylist.isdisjoint(blacklist)
+    assert dark_greylist.isdisjoint(blacklist)
+    assert num_all_api == len(whitelist) + len(light_greylist) + len(dark_greylist) + len(blacklist)
+
+    # Write final lists to disk.
+    write_lines(args.output_whitelist, whitelist)
+    write_lines(args.output_light_greylist, light_greylist)
+    write_lines(args.output_dark_greylist, dark_greylist)
+    write_lines(args.output_blacklist, blacklist)
+
+if __name__ == "__main__":
+    main(sys.argv)
diff --git a/tools/hiddenapi/generate_hiddenapi_lists_test.py b/tools/hiddenapi/generate_hiddenapi_lists_test.py
new file mode 100755
index 0000000..8f79318
--- /dev/null
+++ b/tools/hiddenapi/generate_hiddenapi_lists_test.py
@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Unit tests for Hidden API list generation."""
+import unittest
+from generate_hiddenapi_lists import *
+
+class TestHiddenapiListGeneration(unittest.TestCase):
+
+    def test_move_between_sets(self):
+        A = set([1, 2, 3, 4])
+        B = set([5, 6, 7, 8])
+        move_between_sets(set([2, 4]), A, B)
+        self.assertEqual(A, set([1, 3]))
+        self.assertEqual(B, set([2, 4, 5, 6, 7, 8]))
+
+    def test_move_between_sets_fail_not_superset(self):
+        A = set([1, 2, 3, 4])
+        B = set([5, 6, 7, 8])
+        with self.assertRaises(AssertionError) as ar:
+            move_between_sets(set([0, 2]), A, B)
+
+    def test_move_between_sets_fail_not_disjoint(self):
+        A = set([1, 2, 3, 4])
+        B = set([4, 5, 6, 7, 8])
+        with self.assertRaises(AssertionError) as ar:
+            move_between_sets(set([1, 4]), A, B)
+
+    def test_get_package_name(self):
+        self.assertEqual(get_package_name("Ljava/lang/String;->clone()V"), "Ljava/lang/")
+
+    def test_get_package_name_fail_no_arrow(self):
+        with self.assertRaises(AssertionError) as ar:
+            get_package_name("Ljava/lang/String;-clone()V")
+        with self.assertRaises(AssertionError) as ar:
+            get_package_name("Ljava/lang/String;>clone()V")
+        with self.assertRaises(AssertionError) as ar:
+            get_package_name("Ljava/lang/String;__clone()V")
+
+    def test_get_package_name_fail_no_package(self):
+        with self.assertRaises(AssertionError) as ar:
+            get_package_name("LString;->clone()V")
+
+    def test_all_package_names(self):
+        self.assertEqual(all_package_names(), set())
+        self.assertEqual(all_package_names(set(["Lfoo/Bar;->baz()V"])), set(["Lfoo/"]))
+        self.assertEqual(
+            all_package_names(set(["Lfoo/Bar;->baz()V", "Lfoo/BarX;->bazx()I"])),
+            set(["Lfoo/"]))
+        self.assertEqual(
+            all_package_names(
+                set(["Lfoo/Bar;->baz()V"]),
+                set(["Lfoo/BarX;->bazx()I", "Labc/xyz/Mno;->ijk()J"])),
+            set(["Lfoo/", "Labc/xyz/"]))
+
+    def test_move_all(self):
+        src = set([ "abc", "xyz" ])
+        dst = set([ "def" ])
+        move_all(src, dst)
+        self.assertEqual(src, set())
+        self.assertEqual(dst, set([ "abc", "def", "xyz" ]))
+
+    def test_move_from_packages(self):
+        src = set([ "Lfoo/bar/ClassA;->abc()J",        # will be moved
+                    "Lfoo/bar/ClassA;->def()J",        # will be moved
+                    "Lcom/pkg/example/ClassD;->ijk:J", # not moved: different package
+                    "Lfoo/bar/xyz/ClassC;->xyz()Z" ])  # not moved: subpackage
+        dst = set()
+        packages = set([ "Lfoo/bar/" ])
+        move_from_packages(packages, src, dst)
+        self.assertEqual(
+            src, set([ "Lfoo/bar/xyz/ClassC;->xyz()Z", "Lcom/pkg/example/ClassD;->ijk:J" ]))
+        self.assertEqual(
+            dst, set([ "Lfoo/bar/ClassA;->abc()J", "Lfoo/bar/ClassA;->def()J" ]))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
index 1e03891..e37a856 100644
--- a/wifi/java/android/net/wifi/WifiInfo.java
+++ b/wifi/java/android/net/wifi/WifiInfo.java
@@ -17,14 +17,14 @@
 package android.net.wifi;
 
 import android.annotation.UnsupportedAppUsage;
-import android.os.Parcelable;
-import android.os.Parcel;
 import android.net.NetworkInfo.DetailedState;
 import android.net.NetworkUtils;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.text.TextUtils;
 
-import java.net.InetAddress;
 import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.EnumMap;
 import java.util.Locale;
@@ -540,9 +540,13 @@
         dest.writeInt(mMeteredHint ? 1 : 0);
         dest.writeInt(mEphemeral ? 1 : 0);
         dest.writeInt(score);
+        dest.writeLong(txSuccess);
         dest.writeDouble(txSuccessRate);
+        dest.writeLong(txRetries);
         dest.writeDouble(txRetriesRate);
+        dest.writeLong(txBad);
         dest.writeDouble(txBadRate);
+        dest.writeLong(rxSuccess);
         dest.writeDouble(rxSuccessRate);
         mSupplicantState.writeToParcel(dest, flags);
     }
@@ -570,9 +574,13 @@
                 info.mMeteredHint = in.readInt() != 0;
                 info.mEphemeral = in.readInt() != 0;
                 info.score = in.readInt();
+                info.txSuccess = in.readLong();
                 info.txSuccessRate = in.readDouble();
+                info.txRetries = in.readLong();
                 info.txRetriesRate = in.readDouble();
+                info.txBad = in.readLong();
                 info.txBadRate = in.readDouble();
+                info.rxSuccess = in.readLong();
                 info.rxSuccessRate = in.readDouble();
                 info.mSupplicantState = SupplicantState.CREATOR.createFromParcel(in);
                 return info;
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index b56a758..7a91347 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -981,6 +981,7 @@
     private AsyncChannel mAsyncChannel;
     private CountDownLatch mConnected;
     private Looper mLooper;
+    private boolean mVerboseLoggingEnabled = false;
 
     /* LocalOnlyHotspot callback message types */
     /** @hide */
@@ -1013,6 +1014,7 @@
         mService = service;
         mLooper = looper;
         mTargetSdkVersion = context.getApplicationInfo().targetSdkVersion;
+        updateVerboseLoggingEnabledFromService();
     }
 
     /**
@@ -2475,7 +2477,7 @@
      *
      * @hide
      */
-    private static class SoftApCallbackProxy extends ISoftApCallback.Stub {
+    private class SoftApCallbackProxy extends ISoftApCallback.Stub {
         private final Handler mHandler;
         private final SoftApCallback mCallback;
 
@@ -2486,8 +2488,10 @@
 
         @Override
         public void onStateChanged(int state, int failureReason) {
-            Log.v(TAG, "SoftApCallbackProxy: onStateChanged: state=" + state + ", failureReason=" +
-                    failureReason);
+            if (mVerboseLoggingEnabled) {
+                Log.v(TAG, "SoftApCallbackProxy: onStateChanged: state=" + state
+                        + ", failureReason=" + failureReason);
+            }
             mHandler.post(() -> {
                 mCallback.onStateChanged(state, failureReason);
             });
@@ -2495,7 +2499,9 @@
 
         @Override
         public void onNumClientsChanged(int numClients) {
-            Log.v(TAG, "SoftApCallbackProxy: onNumClientsChanged: numClients=" + numClients);
+            if (mVerboseLoggingEnabled) {
+                Log.v(TAG, "SoftApCallbackProxy: onNumClientsChanged: numClients=" + numClients);
+            }
             mHandler.post(() -> {
                 mCallback.onNumClientsChanged(numClients);
             });
@@ -3786,7 +3792,7 @@
      *
      * @hide
      */
-    private static class TrafficStateCallbackProxy extends ITrafficStateCallback.Stub {
+    private class TrafficStateCallbackProxy extends ITrafficStateCallback.Stub {
         private final Handler mHandler;
         private final TrafficStateCallback mCallback;
 
@@ -3797,7 +3803,9 @@
 
         @Override
         public void onStateChanged(int state) {
-            Log.v(TAG, "TrafficStateCallbackProxy: onStateChanged state=" + state);
+            if (mVerboseLoggingEnabled) {
+                Log.v(TAG, "TrafficStateCallbackProxy: onStateChanged state=" + state);
+            }
             mHandler.post(() -> {
                 mCallback.onStateChanged(state);
             });
@@ -3854,4 +3862,12 @@
             throw e.rethrowFromSystemServer();
         }
     }
+
+    /**
+     * Helper method to update the local verbose logging flag based on the verbose logging
+     * level from wifi service.
+     */
+    private void updateVerboseLoggingEnabledFromService() {
+        mVerboseLoggingEnabled = getVerboseLoggingLevel() > 0;
+    }
 }
diff --git a/wifi/tests/src/android/net/wifi/WifiInfoTest.java b/wifi/tests/src/android/net/wifi/WifiInfoTest.java
new file mode 100644
index 0000000..f5a8b29
--- /dev/null
+++ b/wifi/tests/src/android/net/wifi/WifiInfoTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.wifi;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link android.net.wifi.WifiInfo}.
+ */
+@SmallTest
+public class WifiInfoTest {
+    private static final long TEST_TX_SUCCESS = 1;
+    private static final long TEST_TX_RETRIES = 2;
+    private static final long TEST_TX_BAD = 3;
+    private static final long TEST_RX_SUCCESS = 4;
+
+    /**
+     *  Verify parcel write/read with WifiInfo.
+     */
+    @Test
+    public void testWifiInfoParcelWriteRead() throws Exception {
+        WifiInfo writeWifiInfo = new WifiInfo();
+        writeWifiInfo.txSuccess = TEST_TX_SUCCESS;
+        writeWifiInfo.txRetries = TEST_TX_RETRIES;
+        writeWifiInfo.txBad = TEST_TX_BAD;
+        writeWifiInfo.rxSuccess = TEST_RX_SUCCESS;
+
+        Parcel parcel = Parcel.obtain();
+        writeWifiInfo.writeToParcel(parcel, 0);
+        // Rewind the pointer to the head of the parcel.
+        parcel.setDataPosition(0);
+        WifiInfo readWifiInfo = WifiInfo.CREATOR.createFromParcel(parcel);
+
+        assertNotNull(readWifiInfo);
+        assertEquals(TEST_TX_SUCCESS, readWifiInfo.txSuccess);
+        assertEquals(TEST_TX_RETRIES, readWifiInfo.txRetries);
+        assertEquals(TEST_TX_BAD, readWifiInfo.txBad);
+        assertEquals(TEST_RX_SUCCESS, readWifiInfo.rxSuccess);
+    }
+}
diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java
index 5058080..e40b657a 100644
--- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java
+++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java
@@ -93,6 +93,7 @@
 
         mWifiServiceMessenger = new Messenger(mHandler);
         mWifiManager = new WifiManager(mContext, mWifiService, mLooper.getLooper());
+        verify(mWifiService).getVerboseLoggingLevel();
     }
 
     /**