diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4ef8a83d8..8463c3528 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -66,6 +66,7 @@
 
         <service
             android:name=".autofill.AutofillService"
+            android:enabled="@bool/enable_accessibility_autofill"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
                 <action android:name="android.accessibilityservice.AccessibilityService" />
diff --git a/app/src/main/res/values-v23/bools.xml b/app/src/main/res/values-v23/bools.xml
new file mode 100644
index 000000000..3b1e273c2
--- /dev/null
+++ b/app/src/main/res/values-v23/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="enable_accessibility_autofill">true</bool>
+</resources>
diff --git a/app/src/main/res/values-v26/bools.xml b/app/src/main/res/values-v26/bools.xml
new file mode 100644
index 000000000..86ab6c8ea
--- /dev/null
+++ b/app/src/main/res/values-v26/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="enable_accessibility_autofill">false</bool>
+</resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index de1623ff0..420e5c234 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <bool name="leak_canary_allow_in_non_debuggable_build">true</bool>
+    <bool name="leak_canary_allow_in_non_debuggable_build">true</bool>
 </resources>