Merge cherrypicks of [12377288, 12377131, 12376898, 12377643, 12377644, 12376880, 12377268, 12377269, 12377132, 12377148, 12377149, 12377150, 12377151, 12377152, 12377153, 12377154, 12376899, 12376900, 12376901, 12377762, 12377763, 12377764, 12377528, 12377529, 12377530] into rvc-d1-release

Change-Id: I995d6c035dcd4ac575554ce0071c5f4830a20fcf
diff --git a/vendor/google/modem_svc.te b/vendor/google/modem_svc.te
index f09bfac..a30368d 100644
--- a/vendor/google/modem_svc.te
+++ b/vendor/google/modem_svc.te
@@ -12,11 +12,9 @@
 get_prop(modem_svc, vendor_build_type_prop)
 
 # For bugreport collection
-userdebug_or_eng(`
-  allow modem_svc hal_dumpstate_impl:fd use;
-  allow modem_svc dumpstate:fd use;
-  allow modem_svc shell_data_file:file write;
-')
+allow modem_svc hal_dumpstate_impl:fd use;
+allow modem_svc dumpstate:fd use;
+allow modem_svc shell_data_file:file write;
 
 dontaudit modem_svc sysfs_msm_subsys:dir r_dir_perms;
 dontaudit modem_svc sysfs_ssr:file r_file_perms;