Move extra product priv-app permissions to privapp-permissions-mtg.xml

common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml

@@ -397,10 +397,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON"/>
         <permission name="android.permission.WRITE_APN_SETTINGS"/>
         <permission name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO"/>
-        <permission name="android.permission.WRITE_DREAM_STATE"/>
-        <permission name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
-        <permission name="android.permission.QUERY_USERS"/>
-        <permission name="android.permission.READ_DREAM_STATE"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.hotwordenrollment.okgoogle">

common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="com.google.android.googlequicksearchbox">
+        <permission name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
+        <permission name="android.permission.QUERY_USERS"/>
+        <permission name="android.permission.READ_DREAM_STATE"/>
+        <permission name="android.permission.WRITE_DREAM_STATE"/>
+    </privapp-permissions>
+</permissions>

proprietary-files-common.txt

@@ -14,6 +14,7 @@ product/etc/init/gapps.rc|1b9e076965fe08a03cf90fed0e96f2aa4ac90c0e
 
 product/etc/permissions/com.google.android.dialer.support.xml
 product/etc/permissions/privapp-permissions-google-product.xml
+product/etc/permissions/privapp-permissions-mtg.xml|b8bcdbc95f03e6c3e50a015c092d5a4b3fc878d7
 
 product/etc/security/fsverity/gms_fsverity_cert.der