Snap for 7236715 from 9b20b80b649b7a933c7d9b424c1d3c129b75e987 to sdk-release

Change-Id: I7e30edf25c2b3529da513e783d8cf5bd282de141
diff --git a/vendor/google/grilservice_app.te b/vendor/google/grilservice_app.te
index c757bc7..bc38b93 100644
--- a/vendor/google/grilservice_app.te
+++ b/vendor/google/grilservice_app.te
@@ -7,5 +7,6 @@
 allow grilservice_app app_api_service:service_manager find;
 allow grilservice_app hal_bluetooth_sar_hwservice:hwservice_manager find;
 
+binder_call(grilservice_app, hal_bluetooth_default)
 binder_call(grilservice_app, hal_radioext_default)
 binder_call(grilservice_app, hal_wifi_ext)
diff --git a/vendor/google/hal_health_default.te b/vendor/google/hal_health_default.te
index 838a403..4119520 100644
--- a/vendor/google/hal_health_default.te
+++ b/vendor/google/hal_health_default.te
@@ -4,6 +4,8 @@
 binder_call(hal_health_default, pixelstats_system)
 allow hal_health_default fwk_stats_hwservice:hwservice_manager find;
 binder_call(hal_health_default, statsd)
+allow hal_health_default fwk_stats_service:service_manager find;
+binder_use(hal_health_default)
 allow hal_health_default persist_file:dir search;
 allow hal_health_default persist_battery_file:file create_file_perms;
 allow hal_health_default persist_battery_file:dir rw_dir_perms;
diff --git a/vendor/qcom/common/seapp_contexts b/vendor/qcom/common/seapp_contexts
index 6871b88..123e3c3 100644
--- a/vendor/qcom/common/seapp_contexts
+++ b/vendor/qcom/common/seapp_contexts
@@ -3,7 +3,7 @@
 user=system seinfo=platform name=.dataservices domain=dataservice_app type=system_app_data_file levelFrom=user
 
 # Hardware Info Collection
-user=_app seinfo=platform name=com.google.android.hardwareinfo domain=hardware_info_app type=app_data_file levelFrom=user
+user=_app isPrivApp=true name=com.google.android.hardwareinfo domain=hardware_info_app type=app_data_file levelFrom=user
 
 user=radio isPrivApp=true seinfo=platform name=com.google.RilConfigService domain=ril_config_service_app type=app_data_file levelFrom=all