Snap for 7236715 from 6be9d5c18bcc276b38ea047fdcd75e88cf35de0d to sdk-release

Change-Id: I718b84705e59e48be3c965593b00e2478df40728
diff --git a/vendor/google/grilservice_app.te b/vendor/google/grilservice_app.te
index 1d1ff57..3c6a64e 100644
--- a/vendor/google/grilservice_app.te
+++ b/vendor/google/grilservice_app.te
@@ -2,8 +2,10 @@
 
 app_domain(grilservice_app)
 
+allow grilservice_app hal_bluetooth_coexistence_hwservice:hwservice_manager find;
 allow grilservice_app hal_radioext_hwservice:hwservice_manager find;
 allow grilservice_app hal_wifi_ext_hwservice:hwservice_manager find;
 allow grilservice_app app_api_service:service_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 b38e5b5..11ce328 100644
--- a/vendor/google/hal_health_default.te
+++ b/vendor/google/hal_health_default.te
@@ -4,6 +4,8 @@
 set_prop(hal_health_default, vendor_battery_defender_prop)
 
 allow hal_health_default fwk_stats_hwservice:hwservice_manager find;
+allow hal_health_default fwk_stats_service:service_manager find;
+binder_use(hal_health_default)
 
 allow hal_health_default sysfs_wlc:dir r_dir_perms;
 allow hal_health_default sysfs_thermal:dir r_dir_perms;
diff --git a/vendor/qcom/common/seapp_contexts b/vendor/qcom/common/seapp_contexts
index ca52f85..1d591fa 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