Merge branch '835-s-security' into 'v1-s'

    <!-- Summary for Security settings, explaining a few important settings under it [CHAR LIMIT=NONE] -->

    <string name="security_dashboard_summary">Screen lock, Find My Device, app security</string>

    <!-- Summary for e Security settings, explaining a few important settings under it [CHAR LIMIT=NONE] -->

    <string name="security_dashboard_summary_e">Screen lock, app security</string>

    <!-- Face enrollment and settings --><skip />

    <!-- Note: Update FaceEnrollParentalConsent.CONSENT_STRING_RESOURCES when any _consent_ strings are added or removed. -->

    <!-- Message shown in summary field when face unlock is set up. [CHAR LIMIT=40] -->

    android:key="security_dashboard_page"

    android:title="@string/security_settings_title">

    <!-- security_settings_status.xml -->

    <PreferenceCategory

        android:order="-10"

        android:key="security_status"

        android:title="@string/security_status_title" />

    <PreferenceCategory

        android:order="1"

        android:key="dashboard_tile_placeholder" />

        android:key="top_level_security"

        android:order="-50"

        android:title="@string/security_settings_title"

        android:summary="@string/security_dashboard_summary"

        android:summary="@string/security_dashboard_summary_e"

        settings:highlightableMenuKey="@string/menu_key_security"

        settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>