Merge "Remove attention controller" into qt-r1-dev

diff --cc src/com/android/settings/biometrics/face/FaceSettings.java
index 902d9a1,4348302..b8bb030
--- 1/src/com/android/settings/biometrics/face/FaceSettings.java
--- 2/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@@ -260,8 -255,8 +254,7 @@@ public class FaceSettings extends Dashb
          final List<AbstractPreferenceController> controllers = new ArrayList<>();
          controllers.add(new FaceSettingsVideoPreferenceController(context));
          controllers.add(new FaceSettingsKeyguardPreferenceController(context));
 -        controllers.add(new FaceSettingsLockscreenBypassPreferenceController(context));
          controllers.add(new FaceSettingsAppPreferenceController(context));
-         controllers.add(new FaceSettingsAttentionPreferenceController(context));
          controllers.add(new FaceSettingsRemoveButtonPreferenceController(context));
          controllers.add(new FaceSettingsFooterPreferenceController(context));
          controllers.add(new FaceSettingsConfirmPreferenceController(context));