Snap for 5611628 from d13f162dbc4bbaa8be46363588d7ff2c5f25d3f1 to sdk-release

Change-Id: I6642c33adb836fc711e957b1a14d2ac5c89be65d
diff --git a/vendor/qcom/common/hal_dumpstate_impl.te b/vendor/qcom/common/hal_dumpstate_impl.te
index db35ccf..df95ec7 100644
--- a/vendor/qcom/common/hal_dumpstate_impl.te
+++ b/vendor/qcom/common/hal_dumpstate_impl.te
@@ -13,10 +13,6 @@
   domain_auto_trans(hal_dumpstate_impl, smlog_dump_exec, smlog_dump)
   allow hal_dumpstate_impl modem_dump_file:dir create_dir_perms;
   allow hal_dumpstate_impl modem_dump_file:file create_file_perms;
-  allow hal_dumpstate_impl radio_vendor_data_file:dir r_dir_perms;
-  allow hal_dumpstate_impl radio_vendor_data_file:file r_file_perms;
-  allow hal_dumpstate_impl netmgr_data_file:dir r_dir_perms;
-  allow hal_dumpstate_impl netmgr_data_file:file r_file_perms;
   allow hal_dumpstate_impl sysfs_usb_device:dir r_dir_perms;
   allow hal_dumpstate_impl sysfs_usb_device:file r_file_perms;
   allow hal_dumpstate_impl ssr_log_file:dir search;
@@ -25,6 +21,12 @@
   set_prop(hal_dumpstate_impl, vendor_modem_diag_prop)
 ')
 
+allow hal_dumpstate_impl radio_vendor_data_file:dir r_dir_perms;
+allow hal_dumpstate_impl radio_vendor_data_file:file r_file_perms;
+allow hal_dumpstate_impl netmgr_data_file:dir r_dir_perms;
+allow hal_dumpstate_impl netmgr_data_file:file r_file_perms;
+get_prop(hal_dumpstate_impl, vendor_modem_diag_prop)
+
 # modem stat
 domain_auto_trans(hal_dumpstate_impl, modem_svc_exec, modem_svc)
 allow hal_dumpstate_impl modem_stat_data_file:file r_file_perms;
@@ -87,10 +89,8 @@
 allow hal_dumpstate_impl sysfs_scsi_devices_0000:file r_file_perms;
 
 # Access to MPSS RFS info
-userdebug_or_eng(`
 allow hal_dumpstate_impl mpss_rfs_data_file:dir r_dir_perms;
 allow hal_dumpstate_impl mpss_rfs_data_file:file r_file_perms;
-')
 
 # For collecting bugreports.
 allow hal_dumpstate_impl debugfs_system_ion_heap:file r_file_perms;