diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6477f9d64a8..57727a18aed 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,6 +16,11 @@
         android:name="com.android.settings.USE_BIOMETRIC_PROVIDER"
         android:protectionLevel="signature|privileged"/>
 
+    <!-- Permission for using posture guidance -->
+    <permission
+        android:name="com.google.android.settings.biometrics.face.POSTURE_GUIDANCE"
+        android:protectionLevel="privileged|signature"/>
+
     <uses-permission android:name="android.permission.REQUEST_NETWORK_SCORES" />
     <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
@@ -5749,8 +5754,9 @@
 
         <activity android:theme="@style/SudThemeGlif.Light"
                   android:name="com.google.android.settings.biometrics.face.FaceEnrollConfirmation"
+                  android:permission="com.google.android.settings.biometrics.face.POSTURE_GUIDANCE"
                   android:exported="true"
-                  android:screenOrientation="portrait">
+                  android:screenOrientation="nosensor">
             <intent-filter>
                 <action android:name="com.google.android.settings.action.CONFIRM_FACE_ENROLLMENT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
diff --git a/res/values/lineage_config.xml b/res/values/lineage_config.xml
index 44b6c7431ec..17acef6a0d9 100644
--- a/res/values/lineage_config.xml
+++ b/res/values/lineage_config.xml
@@ -55,4 +55,7 @@
 
     <!-- Traffic light package to use -->
     <string name="config_face_enroll_traffic_light_package"></string>
+
+    <!-- Face enroll finish text -->
+    <string name="security_settings_face_enroll_finish_description_with_bp">Now you can use your face to unlock your phone or verify it’s you, like when you sign in to apps or approve a purchase</string>
 </resources>
diff --git a/src/com/google/android/settings/biometrics/face/FaceEnrollActivityDirector.java b/src/com/google/android/settings/biometrics/face/FaceEnrollActivityDirector.java
index 13af77e34da..446ff54f902 100644
--- a/src/com/google/android/settings/biometrics/face/FaceEnrollActivityDirector.java
+++ b/src/com/google/android/settings/biometrics/face/FaceEnrollActivityDirector.java
@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 
 import androidx.fragment.app.FragmentActivity;
-import androidx.window.R;
+import com.android.settings.R;
 
 import com.android.settings.biometrics.face.FaceEnrollEnrolling;
 
diff --git a/src/com/google/android/settings/biometrics/face/FaceEnrollConfirmation.java b/src/com/google/android/settings/biometrics/face/FaceEnrollConfirmation.java
index ef3c4b51b7c..ce8c36722b7 100644
--- a/src/com/google/android/settings/biometrics/face/FaceEnrollConfirmation.java
+++ b/src/com/google/android/settings/biometrics/face/FaceEnrollConfirmation.java
@@ -11,7 +11,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import androidx.fragment.app.FragmentActivity;
-import androidx.window.R;
+import com.android.settings.R;
 
 import com.google.android.setupcompat.template.FooterBarMixin;
 import com.google.android.setupcompat.template.FooterButton;
@@ -41,7 +41,7 @@ public class FaceEnrollConfirmation extends FragmentActivity {
             this.mUserId = bundle.getInt("android.intent.extra.USER_ID", this.mUserId);
         }
         setHeaderText(R.string.security_settings_face_enroll_finish_title);
-        getLayout().setDescriptionText(R.string.security_settings_face_enroll_finish_description);
+        getLayout().setDescriptionText(R.string.security_settings_face_enroll_finish_description_with_bp);
         FooterBarMixin footerBarMixin = (FooterBarMixin) getLayout().getMixin(FooterBarMixin.class);
         this.mFooterBarMixin = footerBarMixin;
         footerBarMixin.setPrimaryButton(
@@ -55,7 +55,7 @@ public class FaceEnrollConfirmation extends FragmentActivity {
                                     }
                                 })
                         .setButtonType(5)
-                        .setTheme(R.style.SudGlifButton_Primary)
+                        .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
                         .build());
     }