[Autofill Assistant] Conditional country module installs for Android O+.

Before this patch AutofillAssistant flows would lose a non significant
percentage of users that do not yet have the feature module installed.

This patch adds two countries (US, GB) to the conditional install tag
for the dynamic feature module so that this percentage will be lowered.
Due to technical limitations around isolated splits this is only made
available for Android O+ devices.

Also note that this patch had to introduce a slightly different
manifest for trichrome since those modules require min-sdk version 29.

Bug: b/174305656
Change-Id: I49767dc9516e8e383f17c94697d44d3ad65305c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627372
Commit-Queue: Mathias Carlen <mcarlen@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Marian Fechete <marianfe@google.com>
Reviewed-by: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844719}

chrome/android/features/autofill_assistant/autofill_assistant_module.gni

@@ -18,3 +18,12 @@ autofill_assistant_module_desc = {
       "//chrome/android/features/autofill_assistant/java/AndroidManifest.xml"
   uses_split = "chrome"
 }
+
+# Trichrome requires min-sdk version of 29, hence the duplicate but slightly
+# different manifests.
+autofill_assistant_module_trichrome_desc = {
+  name = "autofill_assistant"
+  java_deps = [ "//chrome/android/features/autofill_assistant:java" ]
+  android_manifest = "//chrome/android/features/autofill_assistant/java/AndroidManifestTrichrome.xml"
+  uses_split = "chrome"
+}

chrome/android/features/autofill_assistant/java/AndroidManifest.xml

@@ -3,9 +3,20 @@
     featureSplit="autofill_assistant">
 
     <dist:module
-        dist:onDemand="true"
         dist:title="@string/autofill_assistant_module_title">
         <dist:fusing dist:include="true" />
+        <dist:delivery>
+          <dist:on-demand/>
+          <dist:install-time>
+            <dist:conditions>
+              <dist:min-sdk dist:value="26"/>
+              <dist:user-countries dist:include="true">
+                <dist:country dist:code="US"/>
+                <dist:country dist:code="GB"/>
+              </dist:user-countries>
+            </dist:conditions>
+          </dist:install-time>
+        </dist:delivery>
     </dist:module>
 
     <application>

chrome/android/features/autofill_assistant/java/AndroidManifestTrichrome.xml

+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dist="http://schemas.android.com/apk/distribution"
+    featureSplit="autofill_assistant">
+
+    <dist:module
+        dist:title="@string/autofill_assistant_module_title">
+        <dist:fusing dist:include="true" />
+        <dist:delivery>
+          <dist:on-demand/>
+          <dist:install-time>
+            <dist:conditions>
+              <dist:user-countries dist:include="true">
+                <dist:country dist:code="US"/>
+                <dist:country dist:code="GB"/>
+              </dist:user-countries>
+            </dist:conditions>
+          </dist:install-time>
+        </dist:delivery>
+    </dist:module>
+
+    <application>
+    </application>
+</manifest>

chrome/android/modules/chrome_feature_modules.gni

@@ -60,9 +60,6 @@ monochrome_module_descs = chrome_modern_module_descs
 if (false) {  # AR DFM is currently disabled
   monochrome_module_descs += [ ar_module_desc ]
 }
-if (!disable_autofill_assistant_dfm) {
-  monochrome_module_descs += [ autofill_assistant_module_desc ]
-}
 if (!disable_tab_ui_dfm) {
   monochrome_module_descs += [ tab_ui_module_desc ]
 }
@@ -76,3 +73,10 @@ trichrome_module_descs = monochrome_module_descs
 if (enable_chrome_module && webview_includes_weblayer) {
   monochrome_module_descs += [ weblayer_module_desc ]
 }
+
+# Add a slightly different autofill_assistant module desc for trichrome compared
+# to monochrome.
+if (!disable_autofill_assistant_dfm) {
+  monochrome_module_descs += [ autofill_assistant_module_desc ]
+  trichrome_module_descs += [ autofill_assistant_module_trichrome_desc ]
+}