Merge branch 'android-r' into 'master'

[Android 11] Add privapp perms for gms and vending

See merge request opengapps/all!30

etc/permissions/privapp-permissions-google.xml

@@ -92,6 +92,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.GET_APP_OPS_STATS" />
         <permission name="android.permission.INSTALL_PACKAGES" />
         <permission name="android.permission.INTERACT_ACROSS_USERS" />
+        <permission name="android.permission.LOADER_USAGE_STATS" />
+        <permission name="android.permission.MANAGE_ROLLBACKS" />
         <permission name="android.permission.MANAGE_USERS" />
         <permission name="android.permission.PACKAGE_USAGE_STATS" />
         <permission name="android.permission.PACKAGE_VERIFICATION_AGENT" />
@@ -491,8 +493,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
         <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" />
         <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" />
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE" />
         <permission name="android.permission.CONTROL_DISPLAY_SATURATION" />
+        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE" />
         <permission name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS" />
         <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE" />
         <permission name="android.permission.DUMP" />
@@ -505,6 +507,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.LOCK_DEVICE" />
         <permission name="android.permission.MANAGE_ACTIVITY_STACKS" />
         <permission name="android.permission.MANAGE_DEVICE_ADMINS" />
+        <permission name="android.permission.MANAGE_FACTORY_RESET_PROTECTION" />
+        <permission name="android.permission.MANAGE_ROLLBACKS" />
         <permission name="android.permission.MANAGE_SOUND_TRIGGER" />
         <permission name="android.permission.MANAGE_SUBSCRIPTION_PLANS" />
         <permission name="android.permission.MANAGE_USB" />
@@ -526,8 +530,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.READ_WIFI_CREDENTIAL" />
         <permission name="android.permission.REAL_GET_TASKS" />
         <permission name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE" />
-        <permission name="android.permission.RECOVER_KEYSTORE" />
         <permission name="android.permission.RECOVERY" />
+        <permission name="android.permission.RECOVER_KEYSTORE" />
         <permission name="android.permission.REGISTER_CALL_PROVIDER" />
         <permission name="android.permission.REMOTE_DISPLAY_PROVIDER" />
         <permission name="android.permission.RESET_PASSWORD" />
@@ -541,8 +545,8 @@ 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.TETHER_PRIVILEGED" />
         <permission name="android.permission.UPDATE_APP_OPS_STATS" />
-        <permission name="android.permission.USE_RESERVED_DISK" />
         <permission name="android.permission.USER_ACTIVITY" />
+        <permission name="android.permission.USE_RESERVED_DISK" />
         <permission name="com.android.voicemail.permission.READ_VOICEMAIL" />
     </privapp-permissions>
 
@@ -718,6 +722,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MANAGE_USB" />
         <permission name="android.permission.MANAGE_USERS" />
         <permission name="android.permission.MASTER_CLEAR" />
+        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE" />
         <permission name="android.permission.MODIFY_PHONE_STATE" />
         <permission name="android.permission.NOTIFICATION_DURING_SETUP" />
         <permission name="android.permission.OVERRIDE_WIFI_CONFIG" />
@@ -728,8 +733,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.SET_TIME" />
         <permission name="android.permission.SET_TIME_ZONE" />
         <permission name="android.permission.SHUTDOWN" />
-        <permission name="android.permission.STATUS_BAR" />
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
+        <permission name="android.permission.STATUS_BAR" />
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
         <permission name="android.permission.WRITE_APN_SETTINGS" />
         <permission name="android.permission.WRITE_SECURE_SETTINGS" />