diff --git a/post-fs-data.sh b/post-fs-data.sh
index 453eeef..9fdeb7d 100644
--- a/post-fs-data.sh
+++ b/post-fs-data.sh
@@ -8,4 +8,17 @@ MODDIR=${0%/*}
 # This script will be executed in post-fs-data mode
 
 #resetprop ro.boot.hwc GLOBAL
-#resetprop ro.boot.hwcountry GLOBAL
\ No newline at end of file
+#resetprop ro.boot.hwcountry GLOBAL
+
+maybe_set_prop() {
+    local prop="$1"
+    local contains="$2"
+    local value="$3"
+
+    if [[ "$(getprop "$prop")" == *"$contains"* ]]; then
+        resetprop "$prop" "$value"
+    fi
+}
+
+maybe_set_prop gsm.sim.operator.numeric "," "44011,44011"
+maybe_set_prop gsm.sim.operator.iso-country "," "jp,jp"
diff --git a/system/etc2/permissions/google-hiddenapi-package-whitelist.xml b/system/etc2/permissions/google-hiddenapi-package-whitelist.xml
deleted file mode 100644
index 4e1c8d2..0000000
--- a/system/etc2/permissions/google-hiddenapi-package-whitelist.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This XML file declares which platform apps that need to access internal APIs.
--->
-<config>
-  <hidden-api-whitelisted-app package="android.car.cluster.maserati" />
-  <hidden-api-whitelisted-app package="com.android.apps.tag" />
-  <hidden-api-whitelisted-app package="com.android.auto.embedded.cts.verifier" />
-  <hidden-api-whitelisted-app package="com.android.car.carlauncher" />
-  <hidden-api-whitelisted-app package="com.android.car.home" />
-  <hidden-api-whitelisted-app package="com.android.car.retaildemo" />
-  <hidden-api-whitelisted-app package="com.android.car.settingslib.robotests" />
-  <hidden-api-whitelisted-app package="com.android.car.setupwizardlib.robotests" />
-  <hidden-api-whitelisted-app package="com.android.cardock" />
-  <hidden-api-whitelisted-app package="com.android.connectivity.metrics" />
-  <hidden-api-whitelisted-app package="com.android.facelock" />
-  <hidden-api-whitelisted-app package="com.android.google.gce.gceservice" />
-  <hidden-api-whitelisted-app package="com.android.hotwordenrollment.okgoogle" />
-  <hidden-api-whitelisted-app package="com.android.hotwordenrollment.tgoogle" />
-  <hidden-api-whitelisted-app package="com.android.hotwordenrollment.xgoogle" />
-  <hidden-api-whitelisted-app package="com.android.inputmethod.latin" />
-  <hidden-api-whitelisted-app package="com.android.media.update" />
-  <hidden-api-whitelisted-app package="com.android.netspeed" />
-  <hidden-api-whitelisted-app package="com.android.onemedia" />
-  <hidden-api-whitelisted-app package="com.android.pixellogger" />
-  <hidden-api-whitelisted-app package="com.android.ramdump" />
-  <hidden-api-whitelisted-app package="com.android.settingslib.robotests" />
-  <hidden-api-whitelisted-app package="com.android.simappdialog" />
-  <hidden-api-whitelisted-app package="com.android.statsd.dogfood" />
-  <hidden-api-whitelisted-app package="com.android.statsd.loadtest" />
-  <hidden-api-whitelisted-app package="com.android.systemui.shared" />
-  <hidden-api-whitelisted-app package="com.android.test.power" />
-  <hidden-api-whitelisted-app package="com.android.test.voiceenrollment" />
-  <hidden-api-whitelisted-app package="com.android.tv.provision" />
-  <hidden-api-whitelisted-app package="com.google.SSRestartDetector" />
-  <hidden-api-whitelisted-app package="com.google.android.apps.nexuslauncher" />
-  <hidden-api-whitelisted-app package="com.google.android.apps.wallpaper" />
-  <hidden-api-whitelisted-app package="com.google.android.asdiv" />
-  <hidden-api-whitelisted-app package="com.google.android.athome.globalkeyinterceptor" />
-  <hidden-api-whitelisted-app package="com.google.android.car.bugreport" />
-  <hidden-api-whitelisted-app package="com.google.android.car.defaultstoragemonitoringcompanionapp" />
-  <hidden-api-whitelisted-app package="com.google.android.car.diagnosticrecorder" />
-  <hidden-api-whitelisted-app package="com.google.android.car.diagnosticverifier" />
-  <hidden-api-whitelisted-app package="com.google.android.car.diskwriteapp" />
-  <hidden-api-whitelisted-app package="com.google.android.car.flashapp" />
-  <hidden-api-whitelisted-app package="com.google.android.car.kitchensink" />
-  <hidden-api-whitelisted-app package="com.google.android.car.obd2app" />
-  <hidden-api-whitelisted-app package="com.google.android.car.setupwizard" />
-  <hidden-api-whitelisted-app package="com.google.android.car.usb.aoap.host" />
-  <hidden-api-whitelisted-app package="com.google.android.car.vms.subscriber" />
-  <hidden-api-whitelisted-app package="com.google.android.carrier" />
-  <hidden-api-whitelisted-app package="com.google.android.carriersetup" />
-  <hidden-api-whitelisted-app package="com.google.android.connectivitymonitor" />
-  <hidden-api-whitelisted-app package="com.google.android.edu.harnesssettings" />
-  <hidden-api-whitelisted-app package="com.google.android.ext.services" />
-  <hidden-api-whitelisted-app package="com.google.android.factoryota" />
-  <hidden-api-whitelisted-app package="com.google.android.feedback" />
-  <hidden-api-whitelisted-app package="com.google.android.gsf" />
-  <hidden-api-whitelisted-app package="com.google.android.hardwareinfo" />
-  <hidden-api-whitelisted-app package="com.google.android.hiddenmenu" />
-  <hidden-api-whitelisted-app package="com.google.android.onetimeinitializer" />
-  <hidden-api-whitelisted-app package="com.google.android.permissioncontroller" />
-  <hidden-api-whitelisted-app package="com.google.android.partner.provisioning" />
-  <hidden-api-whitelisted-app package="com.google.android.partnersetup" />
-  <hidden-api-whitelisted-app package="com.google.android.pixel.setupwizard" />
-  <hidden-api-whitelisted-app package="com.google.android.preloaded_drawable_viewer" />
-  <hidden-api-whitelisted-app package="com.google.android.printservice.recommendation" />
-  <hidden-api-whitelisted-app package="com.google.android.sampledeviceowner" />
-  <hidden-api-whitelisted-app package="com.google.android.apps.scone" />
-  <hidden-api-whitelisted-app package="com.google.android.sdksetup" />
-  <hidden-api-whitelisted-app package="com.google.android.setupwizard" />
-  <hidden-api-whitelisted-app package="com.google.android.storagemanager" />
-  <hidden-api-whitelisted-app package="com.google.android.tag" />
-  <hidden-api-whitelisted-app package="com.google.android.tungsten.overscan" />
-  <hidden-api-whitelisted-app package="com.google.android.tungsten.setupwraith" />
-  <hidden-api-whitelisted-app package="com.google.android.tv.bugreportsender" />
-  <hidden-api-whitelisted-app package="com.google.android.tv.frameworkpackagestubs" />
-  <hidden-api-whitelisted-app package="com.google.android.tv.pairedsetup" />
-  <hidden-api-whitelisted-app package="com.google.android.vendorloggingservice" />
-  <hidden-api-whitelisted-app package="com.google.android.volta" />
-  <hidden-api-whitelisted-app package="com.google.android.wfcactivation" />
-  <hidden-api-whitelisted-app package="com.google.mds" />
-  <hidden-api-whitelisted-app package="com.google.modemservice" />
-  <hidden-api-whitelisted-app package="com.htc.omadm.trigger" />
-  <hidden-api-whitelisted-app package="com.qualcomm.qcrilmsgtunnel" />
-  <hidden-api-whitelisted-app package="com.ustwo.lwp" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.accessibilityhelper" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.apkcacheprovider" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.applauncher" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.backup_settings" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.cast_receiver" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.crash_collector" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.file_system" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.gms" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.home" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.intent_helper" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.tts" />
-</config>
diff --git a/system/etc2/permissions/google.xml b/system/etc2/permissions/google.xml
deleted file mode 100644
index 78c3352..0000000
--- a/system/etc2/permissions/google.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- These are configurations that must exist on all GMS devices. -->
-<config>
-    <!-- These are the standard packages that are white-listed to always have internet
-         access while in power save mode, even if they aren't in the foreground. -->
-
-    <!-- GmsCore must always have network access for GCM and other things. -->
-    <allow-in-power-save package="com.google.android.gms" />
-    <allow-in-data-usage-save package="com.google.android.gms" />
-    <allow-unthrottled-location package="com.google.android.gms" />
-    <allow-ignore-location-settings package="com.google.android.gms" />
-
-    <!-- OobConfig must always have network access to fetch enterprise and carrier lock config. -->
-    <allow-in-power-save-except-idle package="com.google.android.apps.work.oobconfig" />
-    <allow-in-data-usage-save package="com.google.android.apps.work.oobconfig" />
-
-    <!-- Turbo must not have App Standby restrictions in order to push new
-         App Standby buckets to the platform periodically -->
-    <allow-in-power-save-except-idle package="com.google.android.apps.turbo" />
-
-    <!-- Certain broadcasts must still go to legacy implicit receivers -->
-    <allow-implicit-broadcast action="com.google.android.checkin.CHECKIN_COMPLETE" />
-    <allow-implicit-broadcast action="com.google.gservices.intent.action.GSERVICES_CHANGED" />
-    <allow-implicit-broadcast action="com.google.gservices.intent.action.GSERVICES_OVERRIDE" />
-    <allow-implicit-broadcast action="com.google.android.c2dm.intent.RECEIVE" />
-    <!-- TODO: This is a temporary workaround for allowing GmsCore to receive this broadcast.
-         This can be removed once OneTimeInitializer functionality is moved to GmsCore. -->
-    <allow-implicit-broadcast action="com.google.android.onetimeinitializer.ONE_TIME_INITIALIZED" />
-
-    <!-- Play Store likewise must have network access to support other applications. -->
-    <allow-in-power-save-except-idle package="com.android.vending" />
-
-    <!-- If the volta app is pre-installed (for monitoring power use), let it do checkins. -->
-    <allow-in-power-save package="com.google.android.volta" />
-
-    <!-- If CarrierServices is installed, it must always have network access to
-         reliably receive IMS messages. -->
-    <allow-in-power-save package="com.google.android.ims" />
-    <allow-in-data-usage-save package="com.google.android.ims" />
-
-    <!-- These Google applications all handle URLs to their websites by default -->
-
-    <!-- Apps below are required on all GMS devices -->
-    <app-link package="com.android.vending" />
-    <app-link package="com.google.android.apps.maps" />
-    <app-link package="com.google.android.youtube" />
-    <app-link package="com.google.android.apps.docs" />
-    <app-link package="com.google.android.talk" />
-    <app-link package="com.google.android.apps.photos" />
-    <app-link package="com.google.android.music" />
-
-    <!-- Apps below are optional on GMS devices -->
-    <app-link package="com.google.android.apps.tycho" />
-    <app-link package="com.google.android.apps.plus" />
-    <app-link package="com.google.android.apps.docs.editors.sheets" />
-    <app-link package="com.google.android.apps.docs.editors.slides" />
-    <app-link package="com.google.android.apps.docs.editors.docs" />
-    <app-link package="com.google.android.talk" />
-    <app-link package="com.google.android.videos" />
-    <app-link package="com.google.android.calendar" />
-
-    <!-- These are the packages that are white-listed to be able to run as system user -->
-    <system-user-whitelisted-app package="com.android.vending" />
-    <system-user-whitelisted-app package="com.google.android.gms" />
-    <system-user-whitelisted-app package="com.google.android.gms.policy_auth" />
-    <system-user-whitelisted-app package="com.google.android.play.games" />
-    <system-user-whitelisted-app package="com.google.android.tts" />
-
-    <!-- These are the packages that are uninstalled for system user -->
-    <!-- Apps below are required on all GMS devices -->
-    <system-user-blacklisted-app package="com.google.android.googlequicksearchbox" />
-    <!-- Apps below are optional on GMS devices -->
-    <system-user-blacklisted-app package="com.google.android.launcher" />
-
-    <!-- Whitelist of what components are permitted as backup data transports.  The
-         'service' attribute here is a flattened ComponentName string. -->
-    <backup-transport-whitelisted-service
-        service="com.google.android.gms/.backup.BackupTransportService" />
-    <backup-transport-whitelisted-service
-        service="com.google.android.gms/.backup.component.D2dTransportService" />
-</config>
diff --git a/system/etc2/permissions/privapp-permissions-platform.xml b/system/etc2/permissions/privapp-permissions-platform.xml
deleted file mode 100644
index e13e390..0000000
--- a/system/etc2/permissions/privapp-permissions-platform.xml
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<!--
-This XML file declares which signature|privileged permissions should be granted to privileged
-applications that come with the platform
--->
-<permissions>
-    <privapp-permissions package="android.ext.services">
-        <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" />
-        <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE" />
-        <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.apps.tag">
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.backupconfirm">
-        <permission name="android.permission.BACKUP"/>
-        <permission name="android.permission.CRYPT_KEEPER"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.captiveportallogin">
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.NETWORK_BYPASS_PRIVATE_DNS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.cellbroadcastreceiver">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.RECEIVE_EMERGENCY_BROADCAST"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.externalstorage">
-        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.location.fused">
-        <permission name="android.permission.INSTALL_LOCATION_PROVIDER"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.managedprovisioning">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.CHANGE_CONFIGURATION"/>
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.CRYPT_KEEPER"/>
-        <permission name="android.permission.DELETE_PACKAGES"/>
-        <permission name="android.permission.INSTALL_PACKAGES"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MASTER_CLEAR"/>
-        <permission name="android.permission.NETWORK_MANAGED_PROVISIONING"/>
-        <permission name="android.permission.PERFORM_CDMA_PROVISIONING"/>
-        <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.SHUTDOWN"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.mms.service">
-        <permission name="android.permission.BIND_CARRIER_MESSAGING_SERVICE"/>
-        <permission name="android.permission.BIND_CARRIER_SERVICES"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.mtp">
-        <permission name="android.permission.MANAGE_USB"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.musicfx">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.networkrecommendation">
-        <permission name="android.permission.SCORE_NETWORKS"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.packageinstaller">
-        <permission name="android.permission.DELETE_PACKAGES"/>
-        <permission name="android.permission.INSTALL_PACKAGES"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.permissioncontroller">
-        <permission name="android.permission.CLEAR_APP_CACHE"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
-        <permission name="android.permission.GET_APP_OPS_STATS"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/>
-        <permission name="android.permission.APPROVE_INCIDENT_REPORTS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.phone">
-        <permission name="android.permission.ACCESS_IMS_CALL_SERVICE"/>
-        <permission name="android.permission.BIND_CARRIER_MESSAGING_SERVICE"/>
-        <permission name="android.permission.BIND_CARRIER_SERVICES"/>
-        <permission name="android.permission.BIND_IMS_SERVICE"/>
-        <permission name="android.permission.BIND_TELEPHONY_DATA_SERVICE"/>
-        <permission name="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"/>
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.CHANGE_CONFIGURATION"/>
-        <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.PERFORM_CDMA_PROVISIONING"/>
-        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.READ_SEARCH_INDEXABLES"/>
-        <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.REGISTER_CALL_PROVIDER"/>
-        <permission name="android.permission.REGISTER_SIM_SUBSCRIPTION"/>
-        <permission name="android.permission.SEND_RESPOND_VIA_MESSAGE"/>
-        <permission name="android.permission.SET_TIME"/>
-        <permission name="android.permission.SET_TIME_ZONE"/>
-        <permission name="android.permission.SHUTDOWN"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <permission name="android.permission.UPDATE_LOCK"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
-        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.providers.calendar">
-        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS" />
-        <permission name="android.permission.MANAGE_USERS" />
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.providers.contacts">
-        <permission name="android.permission.BIND_DIRECTORY_SEARCH"/>
-        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.providers.downloads">
-        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
-        <permission name="android.permission.CLEAR_APP_CACHE"/>
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.providers.media">
-        <permission name="android.permission.ACCESS_MTP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-        <permission name="android.permission.WATCH_APPOPS"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.providers.telephony">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.networkstack">
-        <permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.CONTROL_VPN"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
-        <permission name="android.permission.MANAGE_SUBSCRIPTION_PLANS"/>
-        <permission name="android.permission.MANAGE_USB"/>
-        <permission name="android.permission.NETWORK_BYPASS_PRIVATE_DNS"/>
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
-        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.READ_WIFI_CREDENTIAL"/>
-        <permission name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"/>
-        <permission name="android.permission.TETHER_PRIVILEGED"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.server.telecom">
-        <permission name="android.permission.BIND_CONNECTION_SERVICE"/>
-        <permission name="android.permission.BIND_INCALL_SERVICE"/>
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MANAGE_ROLE_HOLDERS"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING" />
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.sharedstoragebackup">
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.shell">
-        <permission name="android.permission.ACCESS_LOWPAN_STATE"/>
-        <permission name="android.permission.BACKUP"/>
-        <permission name="android.permission.BATTERY_STATS"/>
-        <permission name="android.permission.BIND_APPWIDGET"/>
-        <permission name="android.permission.CHANGE_APP_IDLE_STATE"/>
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.CHANGE_CONFIGURATION"/>
-        <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" />
-        <permission name="android.permission.CHANGE_LOWPAN_STATE"/>
-        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
-        <permission name="android.permission.CLEAR_APP_CACHE"/>
-        <permission name="android.permission.ACCESS_INSTANT_APPS" />
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.DELETE_CACHE_FILES"/>
-        <permission name="android.permission.DELETE_PACKAGES"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.ACTIVITY_EMBEDDING"/>
-        <permission name="android.permission.FORCE_STOP_PACKAGES"/>
-        <permission name="android.permission.GET_APP_OPS_STATS"/>
-        <permission name="android.permission.INSTALL_DYNAMIC_SYSTEM"/>
-        <permission name="android.permission.INSTALL_LOCATION_PROVIDER"/>
-        <permission name="android.permission.INSTALL_PACKAGES"/>
-        <!-- Needed for test only -->
-        <permission name="android.permission.INTERACT_ACROSS_PROFILES"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
-        <permission name="android.permission.MANAGE_ACCESSIBILITY"/>
-        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
-        <permission name="android.permission.MANAGE_USB"/>
-        <permission name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.MOUNT_FORMAT_FILESYSTEMS"/>
-        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-        <permission name="android.permission.MOVE_PACKAGE"/>
-        <permission name="android.permission.OBSERVE_APP_USAGE"/>
-        <permission name="android.permission.NETWORK_SCAN"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS" />
-        <!-- Needed for test only -->
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />
-        <permission name="android.permission.POWER_SAVER" />
-        <permission name="android.permission.READ_FRAME_BUFFER"/>
-        <permission name="android.permission.READ_LOWPAN_CREDENTIAL"/>
-        <!-- Needed for test only -->
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE" />
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.REAL_GET_TASKS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.REGISTER_CALL_PROVIDER"/>
-        <permission name="android.permission.REGISTER_CONNECTION_MANAGER"/>
-        <permission name="android.permission.REGISTER_SIM_SUBSCRIPTION"/>
-        <permission name="android.permission.RETRIEVE_WINDOW_CONTENT"/>
-        <permission name="android.permission.SET_ALWAYS_FINISH"/>
-        <permission name="android.permission.SET_ANIMATION_SCALE"/>
-        <permission name="android.permission.SET_DEBUG_APP"/>
-        <permission name="android.permission.SET_PROCESS_LIMIT"/>
-        <permission name="android.permission.SET_TIME"/>
-        <permission name="android.permission.SET_TIME_ZONE"/>
-        <permission name="android.permission.SIGNAL_PERSISTENT_PROCESSES"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
-        <permission name="android.permission.START_TASKS_FROM_RECENTS" />
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.SUSPEND_APPS" />
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.STATUS_BAR_SERVICE"/>
-        <permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/>
-        <permission name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS"/>
-        <permission name="android.permission.SET_WALLPAPER" />
-        <permission name="android.permission.SET_WALLPAPER_COMPONENT" />
-        <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" />
-        <!-- Permission required to test ExplicitHealthCheckServiceImpl. -->
-        <permission name="android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.statementservice">
-        <permission name="android.permission.INTENT_FILTER_VERIFICATION_AGENT"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.miui.home">
-        <permission name="android.permission.ACCESS_THEME" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.systemui">
-        <permission name="android.permission.ACCESS_THEME" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.tv">
-        <permission name="android.permission.CHANGE_HDMI_CEC_ACTIVE_SOURCE"/>
-        <permission name="android.permission.DVB_DEVICE"/>
-        <permission name="android.permission.GLOBAL_SEARCH"/>
-        <permission name="android.permission.HDMI_CEC"/>
-        <permission name="android.permission.MODIFY_PARENTAL_CONTROLS"/>
-        <permission name="android.permission.READ_CONTENT_RATING_SYSTEMS"/>
-        <permission name="com.android.providers.tv.permission.ACCESS_ALL_EPG_DATA"/>
-        <permission name="com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.vpndialogs">
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.CONTROL_VPN"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.dynsystem">
-        <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.MANAGE_DYNAMIC_SYSTEM"/>
-    </privapp-permissions>
-
-</permissions>