diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 8e0a5bc..41f24d8 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -556,7 +556,6 @@
     <protected-broadcast android:name="android.intent.action.TWILIGHT_CHANGED" />
 
     <protected-broadcast android:name="com.android.server.fingerprint.ACTION_LOCKOUT_RESET" />
-    <protected-broadcast android:name="com.android.server.face.ACTION_LOCKOUT_RESET" />
     <protected-broadcast android:name="android.net.wifi.PASSPOINT_ICON_RECEIVED" />
     <protected-broadcast android:name="com.android.server.notification.CountdownConditionProvider" />
 
@@ -600,6 +599,7 @@
     <protected-broadcast android:name="android.app.action.DATA_SHARING_RESTRICTION_CHANGED" />
     <protected-broadcast android:name="android.app.action.STATSD_STARTED" />
     <protected-broadcast android:name="com.android.server.biometrics.fingerprint.ACTION_LOCKOUT_RESET" />
+    <protected-broadcast android:name="com.android.server.biometrics.face.ACTION_LOCKOUT_RESET" />
 
     <!-- For IdleController -->
     <protected-broadcast android:name="android.intent.action.DOCK_IDLE" />
diff --git a/services/core/java/com/android/server/face/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/face/AuthenticationClient.java
similarity index 99%
rename from services/core/java/com/android/server/face/AuthenticationClient.java
rename to services/core/java/com/android/server/biometrics/face/AuthenticationClient.java
index 9caf713..f9e8793 100644
--- a/services/core/java/com/android/server/face/AuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/face/AuthenticationClient.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.face;
+package com.android.server.biometrics.face;
 
 import android.hardware.biometrics.face.V1_0.IBiometricsFace;
 import com.android.internal.logging.MetricsLogger;
diff --git a/services/core/java/com/android/server/face/ClientMonitor.java b/services/core/java/com/android/server/biometrics/face/ClientMonitor.java
similarity index 99%
rename from services/core/java/com/android/server/face/ClientMonitor.java
rename to services/core/java/com/android/server/biometrics/face/ClientMonitor.java
index b152cf6..4b13db9 100644
--- a/services/core/java/com/android/server/face/ClientMonitor.java
+++ b/services/core/java/com/android/server/biometrics/face/ClientMonitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.face;
+package com.android.server.biometrics.face;
 
 import android.Manifest;
 import android.content.Context;
diff --git a/services/core/java/com/android/server/face/EnrollClient.java b/services/core/java/com/android/server/biometrics/face/EnrollClient.java
similarity index 98%
rename from services/core/java/com/android/server/face/EnrollClient.java
rename to services/core/java/com/android/server/biometrics/face/EnrollClient.java
index f195757..91e489a 100644
--- a/services/core/java/com/android/server/face/EnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/face/EnrollClient.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.face;
+package com.android.server.biometrics.face;
 
 import android.content.Context;
 import android.hardware.biometrics.face.V1_0.IBiometricsFace;
diff --git a/services/core/java/com/android/server/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
similarity index 99%
rename from services/core/java/com/android/server/face/FaceService.java
rename to services/core/java/com/android/server/biometrics/face/FaceService.java
index 2489f64..a9a5ad0 100644
--- a/services/core/java/com/android/server/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.face;
+package com.android.server.biometrics.face;
 
 import static android.Manifest.permission.INTERACT_ACROSS_USERS;
 import static android.Manifest.permission.MANAGE_FACE;
@@ -96,7 +96,7 @@
     private static final String FACE_DATA_DIR = "facedata";
     private static final int MSG_USER_SWITCHING = 10;
     private static final String ACTION_LOCKOUT_RESET =
-            "com.android.server.face.ACTION_LOCKOUT_RESET";
+            "com.android.server.biometrics.face.ACTION_LOCKOUT_RESET";
 
     private class PerformanceStats {
         int accept; // number of accepted faces
diff --git a/services/core/java/com/android/server/face/FaceUserState.java b/services/core/java/com/android/server/biometrics/face/FaceUserState.java
similarity index 98%
rename from services/core/java/com/android/server/face/FaceUserState.java
rename to services/core/java/com/android/server/biometrics/face/FaceUserState.java
index e780ac6..45b842d 100644
--- a/services/core/java/com/android/server/face/FaceUserState.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceUserState.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.face;
+package com.android.server.biometrics.face;
 
 import android.content.Context;
 import android.hardware.face.Face;
diff --git a/services/core/java/com/android/server/face/FaceUtils.java b/services/core/java/com/android/server/biometrics/face/FaceUtils.java
similarity index 97%
rename from services/core/java/com/android/server/face/FaceUtils.java
rename to services/core/java/com/android/server/biometrics/face/FaceUtils.java
index 7fee033..c4a8499 100644
--- a/services/core/java/com/android/server/face/FaceUtils.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.face;
+package com.android.server.biometrics.face;
 
 import android.content.Context;
 import android.hardware.face.Face;
diff --git a/services/core/java/com/android/server/face/InternalRemovalClient.java b/services/core/java/com/android/server/biometrics/face/InternalRemovalClient.java
similarity index 91%
rename from services/core/java/com/android/server/face/InternalRemovalClient.java
rename to services/core/java/com/android/server/biometrics/face/InternalRemovalClient.java
index 158a9e8..634bf8b 100644
--- a/services/core/java/com/android/server/face/InternalRemovalClient.java
+++ b/services/core/java/com/android/server/biometrics/face/InternalRemovalClient.java
@@ -14,12 +14,12 @@
  * limitations under the License
  */
 
-package com.android.server.face;
+package com.android.server.biometrics.face;
 
 import android.content.Context;
 import android.os.IBinder;
 import android.hardware.face.IFaceServiceReceiver;
-import com.android.server.face.RemovalClient;
+import com.android.server.biometrics.face.RemovalClient;
 
 public abstract class InternalRemovalClient extends RemovalClient {
 
diff --git a/services/core/java/com/android/server/face/RemovalClient.java b/services/core/java/com/android/server/biometrics/face/RemovalClient.java
similarity index 98%
rename from services/core/java/com/android/server/face/RemovalClient.java
rename to services/core/java/com/android/server/biometrics/face/RemovalClient.java
index 54b11f3..ccea9d5 100644
--- a/services/core/java/com/android/server/face/RemovalClient.java
+++ b/services/core/java/com/android/server/biometrics/face/RemovalClient.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.face;
+package com.android.server.biometrics.face;
 
 import android.content.Context;
 import android.hardware.biometrics.face.V1_0.IBiometricsFace;
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 1c55b4d..9871976 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -75,7 +75,7 @@
 import com.android.server.display.DisplayManagerService;
 import com.android.server.dreams.DreamManagerService;
 import com.android.server.emergency.EmergencyAffordanceService;
-import com.android.server.face.FaceService;
+import com.android.server.biometrics.face.FaceService;
 import com.android.server.biometrics.fingerprint.FingerprintService;
 import com.android.server.hdmi.HdmiControlService;
 import com.android.server.input.InputManagerService;