Snap for 7236715 from a250a99592e2d6f2697c85289e3a45aa602fa2e2 to sdk-release

Change-Id: Ie879eedfae460eb144ac063a1fcece6d116d097e
diff --git a/vendor/google/hal_health_default.te b/vendor/google/hal_health_default.te
index 8a56297..290972e 100644
--- a/vendor/google/hal_health_default.te
+++ b/vendor/google/hal_health_default.te
@@ -10,6 +10,8 @@
 allow hal_health_default pixelstats_system:binder call;
 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 d795e3b..451e95a 100644
--- a/vendor/qcom/common/seapp_contexts
+++ b/vendor/qcom/common/seapp_contexts
@@ -15,7 +15,7 @@
 user=_app seinfo=tango name=com.google.tango:app domain=untrusted_app type=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
 
 # Use a custom domain for GoogleCamera, to allow for Hexagon DSP access
 user=_app seinfo=google name=com.google.android.GoogleCamera domain=google_camera_app type=app_data_file levelFrom=all