diff --git a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
index 1da32dcacd3..54b78be65fa 100644
--- a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
+++ b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
@@ -26,6 +26,7 @@ import android.text.TextUtils;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.password.ChooseLockGeneric;
@@ -36,7 +37,7 @@ public class ChangeProfileScreenLockPreferenceController extends
     private static final String KEY_UNLOCK_SET_OR_CHANGE_PROFILE = "unlock_set_or_change_profile";
 
     public ChangeProfileScreenLockPreferenceController(Context context,
-            SecuritySettings host) {
+            SettingsPreferenceFragment host) {
         super(context, host);
     }
 
diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
index ea38068648c..322be10a1dd 100644
--- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java
+++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
@@ -29,9 +29,9 @@ import com.android.settings.core.BasePreferenceController;
 public class EncryptionStatusPreferenceController extends BasePreferenceController {
 
 
-    static final String PREF_KEY_ENCRYPTION_DETAIL_PAGE =
+    public static final String PREF_KEY_ENCRYPTION_DETAIL_PAGE =
             "encryption_and_credentials_encryption_status";
-    static final String PREF_KEY_ENCRYPTION_SECURITY_PAGE = "encryption_and_credential";
+    public static final String PREF_KEY_ENCRYPTION_SECURITY_PAGE = "encryption_and_credential";
 
     private final UserManager mUserManager;
 
diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java
index e8a23b7e3b1..98a3c6ff3de 100644
--- a/src/com/android/settings/security/LockUnificationPreferenceController.java
+++ b/src/com/android/settings/security/LockUnificationPreferenceController.java
@@ -33,6 +33,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockscreenCredential;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
@@ -67,7 +68,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
     private final DevicePolicyManager mDpm;
     private final LockPatternUtils mLockPatternUtils;
     private final int mProfileUserId;
-    private final SecuritySettings mHost;
+    private final SettingsPreferenceFragment mHost;
 
     private RestrictedSwitchPreference mUnifyProfile;
 
@@ -82,7 +83,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
         mUnifyProfile = screen.findPreference(KEY_UNIFICATION);
     }
 
-    public LockUnificationPreferenceController(Context context, SecuritySettings host) {
+    public LockUnificationPreferenceController(Context context, SettingsPreferenceFragment host) {
         super(context);
         mHost = host;
         mUm = context.getSystemService(UserManager.class);
@@ -175,7 +176,10 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
                 .launch();
     }
 
-    void startUnification() {
+    /**
+     * Unify primary and profile locks.
+     */
+    public void startUnification() {
         // Confirm profile lock
         final String title = mContext.getString(
                 R.string.unlock_set_unlock_launch_picker_title_profile);
diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
index 5e624ccea02..dd1d63ae339 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
@@ -31,11 +31,11 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.security.SecuritySettings;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -61,7 +61,7 @@ public class TrustAgentListPreferenceController extends AbstractPreferenceContro
 
     private final LockPatternUtils mLockPatternUtils;
     private final TrustAgentManager mTrustAgentManager;
-    private final SecuritySettings mHost;
+    private final SettingsPreferenceFragment mHost;
 
     private Intent mTrustAgentClickIntent;
     private PreferenceCategory mSecurityCategory;
@@ -69,7 +69,7 @@ public class TrustAgentListPreferenceController extends AbstractPreferenceContro
     @VisibleForTesting
     final List<String> mTrustAgentsKeyList;
 
-    public TrustAgentListPreferenceController(Context context, SecuritySettings host,
+    public TrustAgentListPreferenceController(Context context, SettingsPreferenceFragment host,
             Lifecycle lifecycle) {
         super(context);
         final SecurityFeatureProvider provider = FeatureFactory.getFactory(context)