diff --git a/config/permissions/privapp-permissions-cm-legacy.xml b/config/permissions/privapp-permissions-cm-legacy.xml
index 5520c8c9..e1157cac 100644
--- a/config/permissions/privapp-permissions-cm-legacy.xml
+++ b/config/permissions/privapp-permissions-cm-legacy.xml
@@ -15,17 +15,17 @@
 -->
 
 <permissions>
-    <privapp-permissions package="com.cyanogenmod.eleven">
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-    </privapp-permissions>
-
     <privapp-permissions package="org.cyanogenmod.cmsettings">
         <permission name="android.permission.MANAGE_USERS"/>
     </privapp-permissions>
 
+    <privapp-permissions package="com.cyanogenmod.eleven">
+        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+    </privapp-permissions>
+
     <privapp-permissions package="org.cyanogenmod.snap">
-        <permission name="android.permission.PREVENT_POWER_KEY"/>
         <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+        <permission name="android.permission.PREVENT_POWER_KEY"/>
         <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
     </privapp-permissions>
 
diff --git a/config/permissions/privapp-permissions-lineage.xml b/config/permissions/privapp-permissions-lineage.xml
index 4aaddf69..08f3b67e 100644
--- a/config/permissions/privapp-permissions-lineage.xml
+++ b/config/permissions/privapp-permissions-lineage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017-2018 The LineageOS Project
+<!-- Copyright (C) 2017-2019 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,23 +15,14 @@
 -->
 
 <permissions>
-    <privapp-permissions package="android.ext.services">
-        <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.apps.tag">
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
     <privapp-permissions package="com.android.camera2">
         <permission name="android.permission.BIND_WALLPAPER"/>
         <permission name="android.permission.PREVENT_POWER_KEY"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
     </privapp-permissions>
 
+    <!-- Additional permissions on top of privapp-permissions-platform.xml -->
     <privapp-permissions package="com.android.dialer">
         <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-        <permission name="android.permission.STATUS_BAR"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.fmradio">
@@ -40,20 +31,14 @@
         <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
     </privapp-permissions>
 
-    <privapp-permissions package="com.android.gallery3d">
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
+    <!-- Additional permissions on top of privapp-permissions-platform.xml -->
     <privapp-permissions package="com.android.launcher3">
         <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/>
-        <permission name="android.permission.STATUS_BAR"/>
     </privapp-permissions>
 
+    <!-- Additional permissions on top of privapp-permissions-platform.xml -->
     <privapp-permissions package="com.android.systemui">
         <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
-        <permission name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.lineageos.audiofx">
@@ -90,22 +75,22 @@
     </privapp-permissions>
 
     <privapp-permissions package="org.lineageos.setupwizard">
+        <permission name="android.permission.BACKUP"/>
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
         <permission name="android.permission.CHANGE_CONFIGURATION"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.SET_TIME_ZONE"/>
-        <permission name="android.permission.SET_TIME"/>
         <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
         <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.BACKUP"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.SET_TIME"/>
+        <permission name="android.permission.SET_TIME_ZONE"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.lineageos.snap">
-        <permission name="android.permission.PREVENT_POWER_KEY"/>
         <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+        <permission name="android.permission.PREVENT_POWER_KEY"/>
         <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
     </privapp-permissions>