Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
diff --git a/public/bootanim.te b/public/bootanim.te
index 3e0af8e..71f9280 100644
--- a/public/bootanim.te
+++ b/public/bootanim.te
@@ -17,6 +17,7 @@
 
 allow bootanim audioserver_service:service_manager find;
 allow bootanim surfaceflinger_service:service_manager find;
+allow bootanim audioserver_service:service_manager find;
 
 # Allow access to ion memory allocation device
 allow bootanim ion_device:chr_file rw_file_perms;
diff --git a/public/service.te b/public/service.te
index 180f498..d1be52d 100644
--- a/public/service.te
+++ b/public/service.te
@@ -44,7 +44,7 @@
 type commontime_management_service, system_server_service, service_manager_type;
 type connectivity_metrics_logger_service, app_api_service, system_server_service, service_manager_type;
 type connectivity_service, app_api_service, system_server_service, service_manager_type;
-type connmetrics_service, system_server_service, service_manager_type;
+type connmetrics_service, app_api_service, system_server_service, service_manager_type;
 type consumer_ir_service, app_api_service, system_server_service, service_manager_type;
 type content_service, app_api_service, system_server_service, service_manager_type;
 type country_detector_service, app_api_service, system_server_service, service_manager_type;