Merge "Accessibility toggle button small tappable area fix" into tm-qpr-dev am: b2c923fa54

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152758

Change-Id: I2058affebc4a223d32c36b1a4ff2f96edf9b73a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/layout/face_enroll_education.xml b/res/layout/face_enroll_education.xml
index 908dae4..1f9696e 100644
--- a/res/layout/face_enroll_education.xml
+++ b/res/layout/face_enroll_education.xml
@@ -84,8 +84,7 @@
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/limited_vision_button_frame_margin_top">
+                android:layout_height="wrap_content">
 
                 <Button
                     android:id="@+id/accessibility_button"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5992a61..f8d3e50 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -525,7 +525,6 @@
     <dimen name="illustration_accessibility_margin_top">0dp</dimen>
     <dimen name="face_enroll_education_lottie_frame_margin_top">-24dp</dimen>
     <dimen name="lottie_animation_view_margin_top">-52dp</dimen>
-    <dimen name="limited_vision_button_frame_margin_top">-24dp</dimen>
     <dimen name="limited_vision_button_margin_top">0dp</dimen>
     <dimen name="limited_vision_button_margin_bottom">0dp</dimen>
     <dimen name="limited_vision_button_toggle_margin_top">0dp</dimen>