Merge changes from topic "face_slice_update-qt-qpr1-dev" into qt-qpr1-dev

am: b61c1bb3ee

Change-Id: Id50fd1730d584d31219f953a465a3a0d5ba43c32

services/core/java/com/android/server/biometrics/face/FaceService.java

@@ -53,6 +53,7 @@ import android.os.SELinux;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.util.Slog;
 
 import com.android.internal.R;
@@ -926,7 +927,8 @@ public class FaceService extends BiometricServiceBase {
                     final Face face = new Face("", 0 /* identifier */, deviceId);
                     FaceService.super.handleRemoved(face, 0 /* remaining */);
                 }
-
+                Settings.Secure.putIntForUser(getContext().getContentResolver(),
+                        Settings.Secure.FACE_UNLOCK_RE_ENROLL, 0, UserHandle.USER_CURRENT);
             });
         }