[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 81566f806f -s ours

am skip reason: Change-Id I6447f0dc7fc7cba37bacc75bcb21d75aa5033ef1 with SHA-1 86d719e44c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/12470243

Change-Id: I00612fb40d45718a53a4f8541526d1a906d6decd
diff --git a/common/property.te b/common/property.te
index f014ad5..50f7b34 100644
--- a/common/property.te
+++ b/common/property.te
@@ -1 +1 @@
-type vendor_device_prop, property_type;
+vendor_internal_prop(vendor_device_prop)
diff --git a/power-libperfmgr/property.te b/power-libperfmgr/property.te
index 5e889ac..6f6e3a7 100644
--- a/power-libperfmgr/property.te
+++ b/power-libperfmgr/property.te
@@ -1 +1 @@
-type vendor_power_prop, property_type;
+vendor_internal_prop(vendor_power_prop)
diff --git a/thermal/property.te b/thermal/property.te
index 57065a3..676c85a 100644
--- a/thermal/property.te
+++ b/thermal/property.te
@@ -1,2 +1,2 @@
 #thermal HAL
-type vendor_thermal_prop, property_type;
+vendor_internal_prop(vendor_thermal_prop)
diff --git a/wifi_sniffer/property.te b/wifi_sniffer/property.te
index df29700..ca72d35 100644
--- a/wifi_sniffer/property.te
+++ b/wifi_sniffer/property.te
@@ -1 +1 @@
-type vendor_wifi_sniffer_prop, property_type;
+vendor_internal_prop(vendor_wifi_sniffer_prop)