Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: Iae35596629c0a396e24a9877c2c4e99322c4b495
Change-Id: I84b3f43dd187e541a0b93698b92cc46be37bc755
diff --git a/non_plat/factory.te b/non_plat/factory.te
index 6ec8325..b6c968c 100644
--- a/non_plat/factory.te
+++ b/non_plat/factory.te
@@ -385,7 +385,7 @@
 allow factory vendor_nfc_socket:sock_file { create write unlink setattr };
 
 # Allow to get AOSP property persist.radio.multisim.config
-get_prop(factory, exported3_radio_prop)
+get_prop(factory, radio_control_prop)
 
 # Date : WK19.38
 # Operation : Q Migration
diff --git a/non_plat/mtk_hal_secure_element.te b/non_plat/mtk_hal_secure_element.te
index bb51108..9151c82 100644
--- a/non_plat/mtk_hal_secure_element.te
+++ b/non_plat/mtk_hal_secure_element.te
@@ -15,4 +15,4 @@
 allow mtk_hal_secure_element hal_telephony_hwservice:hwservice_manager find;
 
 # Allow to use persist.radio.multisim.config
-get_prop(mtk_hal_secure_element, exported3_radio_prop)
+get_prop(mtk_hal_secure_element, radio_control_prop)
diff --git a/r_non_plat/factory.te b/r_non_plat/factory.te
index 5695bf1..d3e7036 100644
--- a/r_non_plat/factory.te
+++ b/r_non_plat/factory.te
@@ -385,5 +385,5 @@
 allow factory vendor_nfc_socket:sock_file { create write unlink setattr };
 
 # Allow to get AOSP property persist.radio.multisim.config
-get_prop(factory, exported3_radio_prop)
+get_prop(factory, radio_control_prop)
 
diff --git a/r_non_plat/mtk_hal_secure_element.te b/r_non_plat/mtk_hal_secure_element.te
index bb51108..9151c82 100644
--- a/r_non_plat/mtk_hal_secure_element.te
+++ b/r_non_plat/mtk_hal_secure_element.te
@@ -15,4 +15,4 @@
 allow mtk_hal_secure_element hal_telephony_hwservice:hwservice_manager find;
 
 # Allow to use persist.radio.multisim.config
-get_prop(mtk_hal_secure_element, exported3_radio_prop)
+get_prop(mtk_hal_secure_element, radio_control_prop)