commit bbb340f8ea6dea20e98bf000c325f302d5feb76a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Apr 07 20:05:00 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Apr 07 20:05:00 2025 -0700
tree 2fd81a1b1ad4d790d9c31fb5613e25a8a06982d9
parent 294b12a39b0ec2b9d8cf56f8094a5952c519fc32
parent 92e1b25a29738386873379365a3601653b8eb158

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32887373'] into 25Q2-release.

Change-Id: Ia413b76ff8767e69f8a757e39d65c5aeb709b2c7

res/xml/more_security_privacy_settings.xml

diff --git a/res/xml/more_security_privacy_settings.xml b/res/xml/more_security_privacy_settings.xml
index 56706c3..a3725c5 100644
--- a/res/xml/more_security_privacy_settings.xml
+++ b/res/xml/more_security_privacy_settings.xml
@@ -224,7 +224,7 @@
         settings:keywords="@string/keywords_app_pinning"
         settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />
 
-    <Preference
+    <com.android.settingslib.RestrictedPreference
         android:order="300"
         android:id="@+id/memtag_page"
         android:key="memtag_page"