Merge branch 'master' into DNSOverHTTPS_ExcludedDomains

diff --cc README.md
Simple merge

diff --cc mac/org.mozilla.firefox.plist
Simple merge

diff --cc windows/de-DE/firefox.adml
Simple merge

diff --cc windows/en-US/firefox.adml
Simple merge

diff --cc windows/es-ES/firefox.adml
Simple merge

diff --cc windows/firefox.admx
index 99439d857cb606e41ebf420e2ba03c3256d8891f,36948d5c2648ec3e2d569d7dd1b4cd8f7a1140d3..8e9567a30328afb0bdb65c673f91025f3aad017c
--- 1/windows/firefox.admx
--- 2/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -87,11 -91,21 +91,24 @@@
      <category displayName="$(string.TrackingProtection_group)" name="TrackingProtection">
        <parentCategory ref="firefox"/>
      </category>
 +    <category displayName="$(string.DNSOverHTTPS_group)" name="DNSOverHTTPS">
 +      <parentCategory ref="firefox"/>
 +    </category>
+     <category displayName="$(string.UserMessaging_group)" name="UserMessaging">
+       <parentCategory ref="firefox"/>
+     </category>
    </categories>
    <policies>
+     <policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">
+       <parentCategory ref="firefox"/>
+       <supportedOn ref="SUPPORTED_FF75"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
      <policy name="Authentication_SPNEGO" class="Both" displayName="$(string.Authentication_SPNEGO)"  key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" explainText="$(string.Authentication_SPNEGO_Explain)" presentation="$(presentation.Authentication)">
        <parentCategory ref="Authentication"/>
        <supportedOn ref="SUPPORTED_FF60"/>

diff --cc windows/fr-FR/firefox.adml
Simple merge

diff --cc windows/it-IT/firefox.adml
Simple merge

diff --cc windows/zh-TW/firefox.adml
Simple merge