diff --git a/bluetooth.te b/bluetooth.te
index ad44ff1d67e36eb628bbf45f22429daa761c7a72..95307021a147b22cf9305d2a28a085f4a921395f 100644
--- a/bluetooth.te
+++ b/bluetooth.te
@@ -60,7 +60,6 @@ allow bluetooth system_api_service:service_manager find;
 service_manager_local_audit_domain(bluetooth)
 auditallow bluetooth {
     tmp_system_server_service
-    -audio_service
     -bluetooth_manager_service
     -connectivity_service
     -display_service
diff --git a/mediaserver.te b/mediaserver.te
index 6beae0621e5a1b0e4ed5e538a7af6396e9515655..835802e7ada5be16101886ef2694293d54c52759 100644
--- a/mediaserver.te
+++ b/mediaserver.te
@@ -80,6 +80,7 @@ allow mediaserver tee:unix_stream_socket connectto;
 
 allow mediaserver activity_service:service_manager find;
 allow mediaserver appops_service:service_manager find;
+allow mediaserver batterystats_service:service_manager find;
 allow mediaserver drmserver_service:service_manager find;
 allow mediaserver mediaserver_service:service_manager { add find };
 allow mediaserver surfaceflinger_service:service_manager find;
@@ -88,7 +89,6 @@ allow mediaserver tmp_system_server_service:service_manager find;
 service_manager_local_audit_domain(mediaserver)
 auditallow mediaserver {
     tmp_system_server_service
-    -batterystats_service
     -permission_service
     -power_service
     -processinfo_service
diff --git a/nfc.te b/nfc.te
index 556fd2021414c7590240a3fa2ce68a24397f86fc..0cfc447246cf3d07a56020bef4295d98803b3dca 100644
--- a/nfc.te
+++ b/nfc.te
@@ -30,7 +30,6 @@ allow nfc system_api_service:service_manager find;
 service_manager_local_audit_domain(nfc)
 auditallow nfc {
     tmp_system_server_service
-    -batterystats_service
     -bluetooth_manager_service
     -connectivity_service
     -content_service
diff --git a/platform_app.te b/platform_app.te
index 7dedc55436f894c0004b5d68fcc57e45baf4249c..2f1b87cefb094384a9ac6efaf128ed459f91f92c 100644
--- a/platform_app.te
+++ b/platform_app.te
@@ -39,10 +39,6 @@ allow platform_app system_api_service:service_manager find;
 service_manager_local_audit_domain(platform_app)
 auditallow platform_app {
     tmp_system_server_service
-    -appwidget_service
-    -assetatlas_service
-    -audio_service
-    -batterystats_service
     -bluetooth_manager_service
     -connectivity_service
     -content_service
diff --git a/radio.te b/radio.te
index 5b158de7e4f854b8bcdf8749516ed99f327ef0b7..76ffda7674e8aaa2a50e5c5f6fd7577352915894 100644
--- a/radio.te
+++ b/radio.te
@@ -41,7 +41,6 @@ allow radio system_api_service:service_manager find;
 service_manager_local_audit_domain(radio)
 auditallow radio {
     tmp_system_server_service
-    -assetatlas_service
     -bluetooth_manager_service
     -connectivity_service
     -content_service
diff --git a/service.te b/service.te
index e0bcc2f5f343513e7fe6bbb96c06b5114cf2ba4e..a11e64146c2cf94f42a584e024929180318b076b 100644
--- a/service.te
+++ b/service.te
@@ -14,13 +14,13 @@ type system_app_service,        service_manager_type;
 type accessibility_service, app_api_service, system_server_service, service_manager_type;
 type account_service, app_api_service, system_server_service, service_manager_type;
 type activity_service, app_api_service, system_server_service, service_manager_type;
-type alarm_service, tmp_system_server_service, service_manager_type;
+type alarm_service, app_api_service, system_server_service, service_manager_type;
 type appops_service, app_api_service, system_server_service, service_manager_type;
-type appwidget_service, tmp_system_server_service, service_manager_type;
-type assetatlas_service, tmp_system_server_service, service_manager_type;
-type audio_service, tmp_system_server_service, service_manager_type;
-type backup_service, tmp_system_server_service, service_manager_type;
-type batterystats_service, tmp_system_server_service, service_manager_type;
+type appwidget_service, app_api_service, system_server_service, service_manager_type;
+type assetatlas_service, app_api_service, system_server_service, service_manager_type;
+type audio_service, app_api_service, system_server_service, service_manager_type;
+type backup_service, system_api_service, system_server_service, service_manager_type;
+type batterystats_service, app_api_service, system_server_service, service_manager_type;
 type battery_service, tmp_system_server_service, service_manager_type;
 type bluetooth_manager_service, tmp_system_server_service, service_manager_type;
 type clipboard_service, tmp_system_server_service, service_manager_type;
diff --git a/system_app.te b/system_app.te
index eebc644a0ce2c9c4dfc44b79552d8c90253251e7..565db598ebe96407f4413f3989d978f83034598b 100644
--- a/system_app.te
+++ b/system_app.te
@@ -60,10 +60,6 @@ allow system_app system_api_service:service_manager find;
 service_manager_local_audit_domain(system_app)
 auditallow system_app {
     tmp_system_server_service
-    -appwidget_service
-    -assetatlas_service
-    -audio_service
-    -backup_service
     -bluetooth_manager_service
     -connectivity_service
     -content_service
diff --git a/system_server.te b/system_server.te
index 900b87de1709adde347213f4c600ef9570e6567e..0b970be05c48a31de49b9ccc8298b25dd4e2985e 100644
--- a/system_server.te
+++ b/system_server.te
@@ -372,11 +372,6 @@ allow system_server tmp_system_server_service:service_manager { add find };
 service_manager_local_audit_domain(system_server)
 auditallow system_server {
     tmp_system_server_service
-    -alarm_service
-    -assetatlas_service
-    -audio_service
-    -backup_service
-    -batterystats_service
     -bluetooth_manager_service
     -connectivity_service
     -content_service
diff --git a/untrusted_app.te b/untrusted_app.te
index f0961cbcdc46969abd8e02dd7ec3bb3bbfc2389e..7026a84384daceb31b65f49a7a4fed56c5c7ed41 100644
--- a/untrusted_app.te
+++ b/untrusted_app.te
@@ -90,12 +90,6 @@ allow untrusted_app system_api_service:service_manager find;
 service_manager_local_audit_domain(untrusted_app)
 auditallow untrusted_app {
     tmp_system_server_service
-    -appwidget_service
-    -assetatlas_service
-    -audio_service
-    -backup_service
-    -battery_service
-    -batterystats_service
     -bluetooth_manager_service
     -clipboard_service
     -connectivity_service