diff --git a/packages/apps/Car/Settings/res/xml/choose_lock_type_fragment.xml b/packages/apps/Car/Settings/res/xml/choose_lock_type_fragment.xml
index f5dfc2aede..f491896ca5 100644
--- a/packages/apps/Car/Settings/res/xml/choose_lock_type_fragment.xml
+++ b/packages/apps/Car/Settings/res/xml/choose_lock_type_fragment.xml
@@ -20,10 +20,10 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/lock_settings_picker_title"
android:key="@string/psk_choose_lock_type">
- <Preference
+ <!-- <Preference
android:key="@string/pk_no_lock"
android:title="@string/security_lock_none"
- settings:controller="com.android.car.settings.security.NoLockPreferenceController"/>
+ settings:controller="com.android.car.settings.security.NoLockPreferenceController"/>
<Preference
android:key="@string/pk_pattern_lock"
android:title="@string/security_lock_pattern"
@@ -35,5 +35,5 @@
<Preference
android:key="@string/pk_password_lock"
android:title="@string/security_lock_password"
- settings:controller="com.android.car.settings.security.PasswordLockPreferenceController"/>
+ settings:controller="com.android.car.settings.security.PasswordLockPreferenceController"/> -->
</PreferenceScreen>
diff --git a/packages/apps/Settings/res/xml/security_dashboard_settings.xml b/packages/apps/Settings/res/xml/security_dashboard_settings.xml
index b5dcebf6d9..a48ffc93c5 100644
--- a/packages/apps/Settings/res/xml/security_dashboard_settings.xml
+++ b/packages/apps/Settings/res/xml/security_dashboard_settings.xml
@@ -38,11 +38,11 @@
android:key="security_category"
android:title="@string/lock_settings_title">
- <com.android.settings.widget.GearPreference
+ <!--com.android.settings.widget.GearPreference
android:key="unlock_set_or_change"
android:title="@string/unlock_set_unlock_launch_picker_title"
android:summary="@string/summary_placeholder"
- settings:keywords="@string/keywords_lockscreen" />
+ settings:keywords="@string/keywords_lockscreen" /-->
<Preference
android:key="fingerprint_settings"
@@ -155,4 +155,4 @@
android:summary="@string/confirm_sim_deletion_description"
settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController"/>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>