Merge "Add extra check for accessibility flow." into qt-r1-dev

am: c563fbb979

Change-Id: Ib0edf21c01d3e2086f61b80079e9efe5c2b231aa

src/com/android/settings/biometrics/face/FaceEnrollEducation.java

@@ -134,7 +134,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
         final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService(
                 AccessibilityManager.class);
         if (accessibilityManager != null) {
-            accessibilityEnabled = accessibilityManager.isEnabled();
+            // Add additional check for touch exploration. This prevents other accessibility
+            // features such as Live Transcribe from defaulting to the accessibility setup.
+            accessibilityEnabled = accessibilityManager.isEnabled()
+                    && accessibilityManager.isTouchExplorationEnabled();
         }
         mFooterBarMixin.setPrimaryButton(footerButton);
         final Context context = getApplicationContext();