Merge "Change default lock to every time device locks" into main

import static android.os.UserManager.USER_TYPE_PROFILE_PRIVATE;

import static android.provider.Settings.Secure.HIDE_PRIVATESPACE_ENTRY_POINT;

import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK;

import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART;

import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_ON_DEVICE_LOCK;

import static android.provider.Settings.Secure.SKIP_FIRST_USE_HINTS;

import static android.provider.Settings.Secure.USER_SETUP_COMPLETE;

    /** Default value for private space auto lock settings. */

    @Settings.Secure.PrivateSpaceAutoLockOption

    public static final int PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL =

            PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART;

            PRIVATE_SPACE_AUTO_LOCK_ON_DEVICE_LOCK;

    /** Default value for the hide private space sensitive notifications on lockscreen. */

    public static final int HIDE_PRIVATE_SPACE_SENSITIVE_NOTIFICATIONS_DISABLED_VAL = 0;