diff --git a/mobile/android/android-components/samples/browser/src/main/AndroidManifest.xml b/mobile/android/android-components/samples/browser/src/main/AndroidManifest.xml
index 36b24ebd5f89..f8200be21590 100644
--- a/mobile/android/android-components/samples/browser/src/main/AndroidManifest.xml
+++ b/mobile/android/android-components/samples/browser/src/main/AndroidManifest.xml
@@ -132,18 +132,21 @@
         </activity>
 
         <activity android:name=".autofill.AutofillUnlockActivity"
+            tools:targetApi="o"
             android:exported="false"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <activity android:name=".autofill.AutofillConfirmActivity"
+            tools:targetApi="o"
             android:exported="false"
             android:theme="@style/Theme.AppCompat.Translucent" />
 
         <activity android:name=".autofill.AutofillSearchActivity"
+            tools:targetApi="o"
             android:exported="false" />
 
-        <service
-            android:name=".autofill.AutofillService"
+        <service android:name=".autofill.AutofillService"
+            tools:targetApi="o"
             android:label="@string/app_name"
             android:exported="true"
             android:permission="android.permission.BIND_AUTOFILL_SERVICE">
diff --git a/mobile/android/fenix/app/src/main/AndroidManifest.xml b/mobile/android/fenix/app/src/main/AndroidManifest.xml
index fd83241025d6..4ac50eeb096c 100644
--- a/mobile/android/fenix/app/src/main/AndroidManifest.xml
+++ b/mobile/android/fenix/app/src/main/AndroidManifest.xml
@@ -312,14 +312,17 @@
             android:exported="false" />
 
         <activity android:name=".autofill.AutofillUnlockActivity"
+            tools:targetApi="o"
             android:exported="false"
             android:theme="@style/Theme.AppCompat.Translucent" />
 
         <activity android:name=".autofill.AutofillConfirmActivity"
+            tools:targetApi="o"
             android:exported="false"
             android:theme="@style/Theme.AppCompat.Translucent" />
 
         <activity android:name=".autofill.AutofillSearchActivity"
+            tools:targetApi="o"
             android:exported="false"
             android:theme="@style/DialogActivityTheme" />
 
@@ -327,8 +330,8 @@
             android:name=".messaging.NotificationClickedReceiverActivity"
             android:exported="false" />
 
-        <service
-            android:name=".autofill.AutofillService"
+        <service android:name=".autofill.AutofillService"
+            tools:targetApi="o"
             android:exported="true"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_AUTOFILL_SERVICE">